Files
6995f6c457 Dev -> Master Batch 1 Part 1 (#109)
* 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]>
2024-03-15 17:16:53 +01:00

187 lines
6.0 KiB
Python

# Task Breakdown Micro Agent
import asyncio
import logging
from codex.common.ai_block import Identifiers, Tool
from codex.interview.blocks.ai_interview import InterviewBlock
from codex.interview.choose_tool import use_tool
from codex.interview.model import (
InterviewMessage,
InterviewMessageOptionalId,
InterviewMessageUse,
InterviewMessageWithResponse,
InterviewMessageWithResponseOptionalId,
NextStepResponse,
)
logger = logging.getLogger(__name__)
async def process_pending_questions_with_ids(
pending: list[InterviewMessage],
tools: list[Tool],
memory: list[InterviewMessageWithResponse],
ids: Identifiers,
) -> list[InterviewMessageWithResponse]:
pending_with_ids = []
for i in pending:
pending_with_ids.append(
use_tool(
input=InterviewMessageOptionalId(
id=i.id, tool=i.tool, content=i.content
),
available_tools=tools,
ids=ids,
memory=memory,
)
)
return await asyncio.gather(*pending_with_ids)
async def next_step(
task: str,
ids: Identifiers,
memory: list[InterviewMessage | InterviewMessageWithResponse] = [],
tools: list[Tool] = [],
) -> NextStepResponse:
# if there is pending questions, answer them using the blocks
ask_responses = await process_pending_questions_with_ids(
pending=[
i
for i in memory
if i.tool == "ask" and not isinstance(i, InterviewMessageWithResponse)
],
tools=tools,
memory=[x for x in memory if isinstance(x, InterviewMessageWithResponse)],
ids=ids,
)
# remove all memory that was used to ask questions
memory_removals = [
i
for i in memory
if i.tool == "ask" and not isinstance(i, InterviewMessageWithResponse)
]
for removal in memory_removals:
memory.remove(removal)
# add the responses to the memory
memory.extend(ask_responses)
search_responses = await process_pending_questions_with_ids(
pending=[
i
for i in memory
if i.tool == "search" and not isinstance(i, InterviewMessageWithResponse)
],
tools=tools,
memory=[x for x in memory if isinstance(x, InterviewMessageWithResponse)],
ids=ids,
)
# remove all memory that was used to search
memory_removals = [
i
for i in memory
if i.tool == "search" and not isinstance(i, InterviewMessageWithResponse)
]
for removal in memory_removals:
memory.remove(removal)
# add the responses to the memory
memory.extend(search_responses)
# all questions answered, start the interview
interview_start = InterviewBlock()
running_message: InterviewMessageUse = await interview_start.invoke(
ids=ids,
invoke_params={
"task": task,
"tools": {tool.name: tool.description for tool in tools},
"memory": memory,
"tech_stack": {
"programming_language": "Python",
"api_framework": "FastAPI",
"database": "PostgreSQL",
"orm": "Prisma",
},
},
)
# convert all InterviewMessageWithResponseOptionalId to InterviewMessageWithResponse
new_mem = []
for i in memory:
if isinstance(i, InterviewMessageWithResponseOptionalId):
new_mem.append(
InterviewMessageWithResponse(
id=i.id, tool=i.tool, content=i.content, response=i.response
)
)
else:
new_mem.append(i)
memory = new_mem
# if there is only a finished message, return next reponse with it set
if (
any(_.tool == "finished" for _ in running_message.uses)
and len(running_message.uses) == 1
):
# TODO: insert the finished message into the memory? DB?
finished = [x for x in running_message.uses if x.tool == "finished"][0]
finish_response = await use_tool(
input=InterviewMessageOptionalId(
tool=finished.tool, content=finished.content, id=None
),
available_tools=tools,
ids=ids,
memory=[x for x in memory if isinstance(x, InterviewMessageWithResponse)],
)
# if there is a finished message, return the summary from that memory.content and the memory
return NextStepResponse(
memory=[x for x in memory if isinstance(x, InterviewMessageWithResponse)],
questions_to_ask=[],
finished=True,
# this should only ever be one message
finished_text=(finish_response.content, finish_response.response),
)
else:
# Filter out the finished message if it exists, because we clearly aren't
# finished if we have more questions to ask
if any(_.tool == "finish" for _ in running_message.uses):
# remove it from the list of tools
running_message.uses = [
use for use in running_message.uses if use.tool != "finish"
]
# if there are questions to ask, return the questions and the memory
return NextStepResponse(
memory=[x for x in memory if isinstance(x, InterviewMessageWithResponse)],
questions_to_ask=running_message.uses,
finished=False,
)
# if __name__ == "__main__":
# from asyncio import run
# from openai import AsyncOpenAI
# from prisma import Prisma
# from codex.common.test_const import identifier_1
# ids = identifier_1
# db_client = Prisma(auto_register=True)
# oai = AsyncOpenAI()
# async def main():
# await db_client.connect()
# response, memory = await gather_task_info_loop(
# task="I need to make a website",
# ids=ids,
# )
# logger.info(response)
# await db_client.disconnect()
# return response, memory
# resp = run(main())
# logger.info(resp[0])
# logger.info(resp[1])