mirror of
https://github.com/Significant-Gravitas/AutoGPT-Code-Ability.git
synced 2026-11-09 15:41:27 -10:00
* Route schema changes * Delete ruff.config.json * save current changes * style fixes by ruff * Add class parsing capability * Fix bugs * Address comments * Fix benchmarks * Fix benchmarks * Fix benchmarks * Add comments * fixing types * Add error handling and status messages for application creation * Refactor fetch_deliverable function and update application creation status * Refactor benchmark output formatting * Remove unnecessary print statement in fetch_deliverable function * Propagate DB schema changes: Function <-> CompiledRouteSpec (#65) Propagate DB schema changes: Function <-> CompiledRouteSpec (#65) --------- Co-authored-by: majdyz <[email protected]> Co-authored-by: Swifty <[email protected]> Co-authored-by: majdyz <[email protected]> * emoved broken hardcoded requirements * Add benchmarking functionality * Update branch restrictions in GitHub workflows * Add pytest-cov to dependencies * Update ruff formatter command to include --check option * Update workflow names * Refactor code formatting and fix indentation issues * Update Python dependency caching and installation process * Add Prisma client generation step to CI workflow * Refactor test_process_object_type to use async/await * Add pytest and ValidationError imports, update arg_types assertion, and add test for ValidationError * Remove unused imports and commented code * Add logger to OpenAIChatClient class * Add async context manager for database connection and disconnection * Add blank line for readability * Refactor function_def.arg_types assignment in ast_test.py * mark integration tests * Update test workflow name * Add OpenAI API key configuration * Better Types for Requirements Request/Response (#76) Better Types for Requirements Request/Response --------- Co-authored-by: majdyz <[email protected]> * [AGPT-474] End-to-end Benchmark (#77) * Remove unnecessary fetch_deliverable calls and update invoice_generator_requirements * Fix typo in hardcoded.py * Add missing app IDs and interview IDs for calendar booking, inventory management, and invoicing systems * Add options to benchmark and example commands * Refactor benchmarking code and add new functions * Add task description method to ExampleTask enum * Added end-to-end running * Add hardcoded flag to filter examples in benchmark.py * Refactor run_benchmark_example function to handle exceptions * Fix error handling in specification routes * Fix Function generation bug on nested object type (#79) Co-authored-by: majdyz <[email protected]> * Speeding up requirements system --------- Co-authored-by: Zamil Majdy <[email protected]> Co-authored-by: majdyz <[email protected]> * Refactor code: Remove unused imports and clean up formatting * [AGPT-478] Add Support for Composite Type with multiple Pydantic/nont-primitive classes (#78) * [AGPT-478] Add support for multiple composite Pydantic objects * Ruff Ruff! * Fix failing test * formatting * fix populate-db command * fix run all benchmarks --------- Co-authored-by: majdyz <[email protected]> Co-authored-by: Swifty <[email protected]> * Refactor package handling in packager.py (#81) * [Fix] User provided app name being replaced (#82) * Only make databases when required (#83) * feat: make the name match * feat: database becomes optional * Update agent.py * Integrate related types into the requirements system (#84) * feat: make the name match * feat: database becomes optional * feat: initial model changes * feat: add prompts * feat: more prompts * fix: nits * fix: wrong type 😢 * feat: improved prompts * Cleanup for field type (#85) Co-authored-by: majdyz <[email protected]> * [AGPT-489] Improve type composite-type matching & extracting algorithm (#86) Co-authored-by: majdyz <[email protected]> * [AGPT-489] Add Autogeneration of Typing import (#87) Co-authored-by: majdyz <[email protected]> * [AGPT-489] Fix broken class compiling logic (#88) Co-authored-by: majdyz <[email protected]> * [AGPT-489] Fix function fetching to always include RelatedTypes (#89) [AGPT-489] Fix function fetching to always include RelatedTypes --------- Co-authored-by: majdyz <[email protected]> * fix lock file * feat: endpoint updates (#95) * feat: endpoint updates * fix: ambiguous param * [AGPT-486] Fix codegen generate code with missing pydantic object (#92) Co-authored-by: majdyz <[email protected]> * Fix retry prompt (#96) Co-authored-by: majdyz <[email protected]> * Allow benchmark on $PORT (#98) * Ntindle/agpt 506 add a bit of debug tooling for requirements gen (#100) * [AGPT-485] Fix missing pydantic object during requirement-step; leading to LLM to guess wrong signature (#97) [AGPT-485] Fix missing pydantic object during requirement-step; leading to LLM to guess wrong signature --------- Co-authored-by: majdyz <[email protected]> * [AGPT-157] Add Database Integration Generation (#90) * Added prisma client to server code * Add DatabaseSchema to INCLUDE_FUNC * Update functions to be async and add database schema documentation * Add DatabaseSchema and DatabaseTables to ApiRouteSpec * Updated dev prompts for db * Update profile management descriptions * Update route function definition to be async * Remove logging of database schema * Add Prisma schema file generation * Refactor benchmark and agent modules * Refactor code and comment out debug statements * formatting * Add available_functions to develop_route * Update prisma import and method calls * loading all related tables * Refactor create_prisma_scheama_file function to handle cases with no database schema * Fix async function call in packager.py * Fix database table query in packager.py * Fix database access and unnecessary imports * review comments * [AGPT-508] Enum support for Codex - Generation Logic Layer (#102) Co-authored-by: majdyz <[email protected]> * Add Enum Generation to Requriements (#101) * Added prisma client to server code * Add DatabaseSchema to INCLUDE_FUNC * Update functions to be async and add database schema documentation * Add DatabaseSchema and DatabaseTables to ApiRouteSpec * Updated dev prompts for db * Update profile management descriptions * Update route function definition to be async * Remove logging of database schema * Add Prisma schema file generation * Refactor benchmark and agent modules * Refactor code and comment out debug statements * formatting * Add available_functions to develop_route * Update prisma import and method calls * loading all related tables * Refactor create_prisma_scheama_file function to handle cases with no database schema * Fix async function call in packager.py * Fix database table query in packager.py * Fix database access and unnecessary imports * feat: add enums to the database gen * fix: formatting * Updated to new schema * update hardcoded requirements * fix: objectType generation without type bool * Add database enum import statement * removed unused var as failing lint check --------- Co-authored-by: SwiftyOS <[email protected]> * More Linting Issues Fixes (#99) * fix: more linting issues * Remove error log for async functions * Fix return_type default value in FunctionDef class * Added another validation check --------- Co-authored-by: Swifty <[email protected]> * [AGPT-463] Add code generation validation using Ruff (#103) --------- Co-authored-by: majdyz <[email protected]> * feat: extract external command on in memory code to a function with tests * feat: prisma model parser * feat: database test updates now requires prisma to run * feat: test for prisma accessible * feat: update to use format and validate Also saves the formatted and validated models in place * fix: lint * fix: remove unused variable * feat: allow multiple generators * .gitignore and .env.example (#107) * feat: .env.example * feat: gitignore * fix: replace all bad chars with NOTHING also fix the format string * Add Database Docker Compose File (#108) * feat: .env.example * feat: gitignore * fix: replace all bad chars with NOTHING also fix the format string * feat: add docker compose with only db --------- Co-authored-by: Swifty <[email protected]> * feat: remove vector requirement (#106) * Fix lifecycle and prisma models and enums missing (#105) * fix: add prisma model imports fro root level * fix: reorder start code and add lifecycle * Validate Database Generation (#104) * feat: extract external command on in memory code to a function with tests * feat: prisma model parser * feat: database test updates now requires prisma to run * feat: test for prisma accessible * feat: update to use format and validate Also saves the formatted and validated models in place * fix: lint * fix: remove unused variable * feat: allow multiple generators * formatting * Change logger.info to logger.debug in exec_external_on_contents function * Update error logging in exec_external_on_contents function * Update response model and route annotation in compile.py * Force * Ruff * Fix Api route spec * formatting * Dont generate envexample passwords with symbols in them (#117) * fix: don't use special chars in db password * fix: linting * [AGPT-540] Add missing initialization of available object types (#113) * [AGPT-540] Add missing initialization of available object types * [AGPT-540] Add missing initialization of available object types * [AGPT-540] Add missing initialization of available object types * Ruff * allow non-annotated type checking * Include all available function for ruff * Fix tests * Make DB work * Make stubbing work * Make papa-lint happy * Ruffs * Add prisma model validation layer * Improve prisma querying by avoiding conflict * Move on during failure formatting --------- Co-authored-by: majdyz <[email protected]> * main into dev (#118) * Update setup guide. * [AGPT-544] Vague 500 errors in interview stage (#115) * Add error handling for user not found in database during interview step. * Add error handling for app not found in database during interview step. * Add error handling for interview not found in database during interview step. * Add error handling for nonexistent questions in interview step. * Add error handling for non-"ask" tool in user answers in interview step. * Clarify comment describing interview next_step. --------- Co-authored-by: Toran Bruce Richards <[email protected]> * [AGPT-511] Resume running from any point (#114) * Refactor populate_db function and add get_resume_points command * Fix app ID reference in benchmark.py * Add ResumePoint model * Added runner funcitons to running codex from the cli * Add application description field to ApplicationBase model and update create_app method in CodexClient * Refactor code to run tasks concurrently * Add include parameter to find_many() method in get_resume_points() * Add disconnect calls to asyncio event loop * Update resume_point name to display only the first 30 characters * Remove commented out code and unused imports * Remove unused code * formatting * Fix validation error handling in develop.py * formatting * fixes * Add validation error for unimplemented main function * Validate and try-fix generated endpoint db and model usage (#116) * feat: log status * feat: trivial implementation of copy works for request -> response and response-> request for unfilled object but not list[unfilled_object] * fix: i cant rememember * feat: more complex * feat: mostly working * fix: fixes from tests * feat: tests * fix: linting problems and test name * feat: add more supported types * fix: remove unused data * fix: stop using print * fix: arrays of arrays * fix: lint * fix: reduce mess * feat: more complex type that I hope we never actually use * fix: lint --------- Co-authored-by: majdyz <[email protected]> Co-authored-by: majdyz <[email protected]> Co-authored-by: Zamil Majdy <[email protected]> Co-authored-by: Nicholas Tindle <[email protected]> Co-authored-by: Nicholas Tindle <[email protected]> Co-authored-by: Toran Bruce Richards <[email protected]>
222 lines
6.3 KiB
Python
222 lines
6.3 KiB
Python
from prisma.enums import Role
|
|
from prisma.models import Application, User
|
|
from prisma.types import UserCreateWithoutRelationsInput
|
|
|
|
from codex.api_model import (
|
|
ApplicationCreate,
|
|
ApplicationResponse,
|
|
ApplicationsListResponse,
|
|
Pagination,
|
|
UserResponse,
|
|
UsersListResponse,
|
|
)
|
|
from codex.common import test_const
|
|
|
|
|
|
async def create_test_data():
|
|
# user_id_1 = test_const.user_id_1
|
|
# user_id_2 = test_const.user_id_2
|
|
user_1 = test_const.identifier_1
|
|
user_1_discord = test_const.discord_id_1
|
|
user_2 = test_const.identifier_2
|
|
user_2_discord = test_const.discord_id_2
|
|
if not user_1.user_id or not user_2.user_id:
|
|
raise ValueError("User ID not found for user 1 and user 2")
|
|
if not user_1.cloud_services_id or not user_2.cloud_services_id:
|
|
raise ValueError("Cloud Services ID not found for user 1 and user 2")
|
|
|
|
await User.prisma().create_many(
|
|
[
|
|
UserCreateWithoutRelationsInput(
|
|
id=user_1.user_id,
|
|
cloudServicesId=user_1.cloud_services_id,
|
|
discordId=user_1_discord,
|
|
role=Role.ADMIN,
|
|
deleted=False,
|
|
),
|
|
UserCreateWithoutRelationsInput(
|
|
id=user_2.user_id,
|
|
cloudServicesId=user_2.cloud_services_id,
|
|
discordId=user_2_discord,
|
|
role=Role.USER,
|
|
deleted=False,
|
|
),
|
|
UserCreateWithoutRelationsInput(
|
|
id=test_const.user_id_3,
|
|
cloudServicesId=test_const.cloud_services_id_3,
|
|
discordId=test_const.discord_id_3,
|
|
role=Role.USER,
|
|
deleted=False,
|
|
),
|
|
]
|
|
)
|
|
|
|
|
|
async def get_or_create_user_by_cloud_services_id_and_discord_id(
|
|
cloud_services_id: str,
|
|
discord_id: str,
|
|
) -> User:
|
|
user = await User.prisma().upsert(
|
|
where={"discordId": discord_id},
|
|
data={
|
|
"create": {
|
|
"discordId": discord_id,
|
|
"cloudServicesId": cloud_services_id,
|
|
},
|
|
"update": {},
|
|
},
|
|
)
|
|
|
|
return user
|
|
|
|
|
|
async def get_user(user_id: str) -> User:
|
|
user = await User.prisma().find_unique_or_raise(where={"id": user_id})
|
|
|
|
return user
|
|
|
|
|
|
async def list_users(page: int, page_size: int) -> UsersListResponse:
|
|
# Calculate the number of items to skip
|
|
skip = (page - 1) * page_size
|
|
|
|
# Query the database for the total number of users
|
|
total_items = await User.prisma().count()
|
|
if total_items == 0:
|
|
return UsersListResponse(
|
|
users=[],
|
|
pagination=Pagination(
|
|
total_items=0, total_pages=0, current_page=0, page_size=0
|
|
),
|
|
)
|
|
|
|
# Query the database for users with pagination
|
|
users = await User.prisma().find_many(skip=skip, take=page_size)
|
|
|
|
# Calculate the total number of pages
|
|
total_pages = (total_items + page_size - 1) // page_size
|
|
|
|
# Create the pagination object
|
|
pagination = Pagination(
|
|
total_items=total_items,
|
|
total_pages=total_pages,
|
|
current_page=page,
|
|
page_size=page_size,
|
|
)
|
|
|
|
user_responses = [
|
|
UserResponse(
|
|
id=user.id,
|
|
cloud_services_id=user.cloudServicesId,
|
|
discord_id=user.discordId,
|
|
createdAt=user.createdAt,
|
|
role=user.role,
|
|
)
|
|
for user in users
|
|
]
|
|
|
|
# Return both the users and the pagination info
|
|
return UsersListResponse(users=user_responses, pagination=pagination)
|
|
|
|
|
|
async def get_app_by_id(user_id: str, app_id: str) -> ApplicationResponse:
|
|
app = await Application.prisma().find_first_or_raise(
|
|
where={
|
|
"id": app_id,
|
|
"userId": user_id,
|
|
"deleted": False,
|
|
},
|
|
include={"User": True},
|
|
)
|
|
if not app.userId:
|
|
raise AssertionError("Application not found")
|
|
|
|
return ApplicationResponse(
|
|
id=app.id,
|
|
createdAt=app.createdAt,
|
|
updatedAt=app.updatedAt,
|
|
name=app.name,
|
|
userid=app.userId,
|
|
cloud_services_id=app.User.cloudServicesId if app.User else "",
|
|
)
|
|
|
|
|
|
async def create_app(user_id: str, app_data: ApplicationCreate) -> ApplicationResponse:
|
|
app = await Application.prisma().create(
|
|
data={
|
|
"name": app_data.name,
|
|
"description": app_data.description,
|
|
"userId": user_id,
|
|
},
|
|
include={"User": True},
|
|
)
|
|
|
|
if not app.userId:
|
|
raise AssertionError("Application not found")
|
|
|
|
return ApplicationResponse(
|
|
id=app.id,
|
|
createdAt=app.createdAt,
|
|
updatedAt=app.updatedAt,
|
|
name=app.name,
|
|
userid=app.userId,
|
|
cloud_services_id=app.User.cloudServicesId if app.User else "",
|
|
)
|
|
|
|
|
|
async def delete_app(user_id: str, app_id: str) -> None:
|
|
await Application.prisma().update(
|
|
where={
|
|
"id": app_id,
|
|
"userId": user_id,
|
|
},
|
|
data={"deleted": True},
|
|
)
|
|
|
|
|
|
async def list_apps(
|
|
user_id: str, page: int, page_size: int
|
|
) -> ApplicationsListResponse:
|
|
skip = (page - 1) * page_size
|
|
total_items = await Application.prisma().count(
|
|
where={"userId": user_id, "deleted": False}
|
|
)
|
|
apps = await Application.prisma().find_many(
|
|
where={"userId": user_id, "deleted": False},
|
|
include={"User": True},
|
|
skip=skip,
|
|
take=page_size,
|
|
)
|
|
if apps:
|
|
total_pages = (total_items + page_size - 1) // page_size
|
|
|
|
applications_response = [
|
|
ApplicationResponse(
|
|
id=app.id,
|
|
createdAt=app.createdAt,
|
|
updatedAt=app.updatedAt,
|
|
name=app.name,
|
|
userid=app.userId if app.userId else "",
|
|
cloud_services_id=app.User.cloudServicesId if app.User else "",
|
|
)
|
|
for app in apps
|
|
]
|
|
|
|
pagination = Pagination(
|
|
total_items=total_items,
|
|
total_pages=total_pages,
|
|
current_page=page,
|
|
page_size=page_size,
|
|
)
|
|
|
|
return ApplicationsListResponse(
|
|
applications=applications_response, pagination=pagination
|
|
)
|
|
else:
|
|
return ApplicationsListResponse(
|
|
applications=[],
|
|
pagination=Pagination(
|
|
total_items=0, total_pages=0, current_page=0, page_size=0
|
|
),
|
|
)
|