Merge branch 'main' into issue-957/-use-FE-host-as-BE-host

.github/workflows/black.yml → .github/workflows/check-python-code-black.yml

@@ -1,4 +1,4 @@
-name: black-check-action
+name: Check Python Code - Black
 on:
   pull_request:
     paths:

.github/workflows/lint-and-build.yml → .github/workflows/check-web-code-lint-and-build.yml

@@ -1,4 +1,4 @@
-name: Lint and Build
+name: Check Web Code - Lint and Build
 
 on:
   pull_request:

.github/workflows/prettier.yml → .github/workflows/check-web-code-prettier.yml

@@ -1,4 +1,4 @@
-name: Prettier
+name: Check web Code - Prettier
 
 on:
   pull_request:

.github/workflows/publish.yml → .github/workflows/publish-to-pypi.yml

@@ -1,4 +1,4 @@
-name: Publish Agenta to PyPI
+name: Publish to PyPI
 
 on:
   push:

.github/workflows/docker.yml → .github/workflows/push-to-ghcr.yml

@@ -1,6 +1,7 @@
-name: Build and Publish Docker Images
+name: Push to GitHub Container Registry
 
-on: 
+on:
+  workflow_dispatch:
   push:
     branches:
       - main
@@ -33,7 +34,7 @@ jobs:
           registry: ghcr.io
           username: ${{ env.REPOSITORY_USERNAME }}
           password: ${{ secrets.DOCKER_GITHUB_SECRETS }}
-          
+
       - name: Build, tag and push Backend image to Github Container Registry
         id: build-backend-image
         run: |

.github/workflows/backend_test.yml → .github/workflows/run-backend-tests.yml

@@ -1,4 +1,4 @@
-name: Execute Backend tests
+name: Run Backend tests
 
 on: [pull_request]
 

.github/workflows/frontend-tests.yml → .github/workflows/run-frontend-tests.yml

@@ -1,4 +1,4 @@
-name: Execute Frontend tests
+name: Run Frontend tests
 
 on: [pull_request]
 env:
@@ -11,11 +11,11 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v4
-        
+
       - name: Set Environment Variables
         run: |
           echo "NEXT_PUBLIC_OPENAI_API_KEY=${{ secrets.NEXT_PUBLIC_OPENAI_API_KEY }}" >> $GITHUB_ENV
-    
+
       - name: Install Curl & Start Docker Compose
         env:
           NEXT_PUBLIC_OPENAI_API_KEY: ${{ secrets.NEXT_PUBLIC_OPENAI_API_KEY }}
@@ -25,7 +25,7 @@ jobs:
 
       - name: Restart Backend Service To Fetch Template(s)
         run: docker container restart agenta_backend_1
-        
+
       - name: Wait for Backend Service
         run: curl http://localhost/api/health/
 
@@ -53,6 +53,6 @@ jobs:
       - name: Docker logs
         if: always()  #
         run: docker ps -q | xargs -I {} docker logs {}
-        
+
       - name: Stop Docker Compose
         run: docker-compose down

agenta-cli/agenta/sdk/types.py

@@ -116,11 +116,8 @@ class MessagesInput(list):
     """
 
     def __new__(cls, messages: List[Dict[str, str]] = None):
-        if not messages:
-            raise ValueError("Missing required parameter in MessagesInput")
-
         instance = super().__new__(cls, messages)
-        instance.messages = messages
+        instance.default = messages
         return instance
 
     @classmethod

agenta-cli/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "agenta"
-version = "0.5.8"
+version = "0.6.0"
 description = "The SDK for agenta is an open-source LLMOps platform."
 readme = "README.md"
 authors = ["Mahmoud Mabrouk <[email protected]>"]

agenta-web/src/components/AppSelector/modals/AddAppFromTemplateModal.tsx

@@ -16,8 +16,7 @@ const useStyles = createUseStyles({
     body: {
         width: "100%",
         marginTop: 20,
-        display: "grid",
-        gridTemplateColumns: "repeat(auto-fill, minmax(min(240px, 100%), 1fr))",
+        display: "flex",
         gap: 20,
     },
     row: {
@@ -54,7 +53,7 @@ const AddAppFromTemplatedModal: React.FC<Props> = ({
                     Choose template
                 </Title>
             }
-            width={templates.length <= 1 || !!noTemplateMessage ? 620 : 900}
+            width={templates.length <= 1 || !!noTemplateMessage ? 620 : 700}
             {...props}
         >
             <div className={classes.body}>
@@ -69,7 +68,7 @@ const AddAppFromTemplatedModal: React.FC<Props> = ({
                     </div>
                 ) : (
                     templates.map((template) => (
-                        <div key={template.id}>
+                        <div key={template.id} style={{flex: 1}}>
                             <AppTemplateCard
                                 title={template.image.title}
                                 body={template.image.description}

agenta-web/src/lib/helpers/openapi_parser.ts

@@ -21,9 +21,11 @@ const getBodySchemaName = (schema: GenericObject): string => {
 
 export const detectChatVariantFromOpenAISchema = (schema: GenericObject) => {
     const bodySchemaName = getBodySchemaName(schema)
-    return (
-        schema.components.schemas[bodySchemaName].properties?.inputs?.["x-parameter"] === "messages"
-    )
+    const bodyProperties = schema.components.schemas[bodySchemaName].properties
+    const propertiesWithMessages = Object.keys(bodyProperties).filter((property) => {
+        return bodyProperties[property]["x-parameter"] === "messages"
+    })
+    return propertiesWithMessages[0] === "messages"
 }
 
 export const openAISchemaToParameters = (schema: GenericObject): Parameter[] => {
@@ -35,7 +37,7 @@ export const openAISchemaToParameters = (schema: GenericObject): Parameter[] =>
         ([name, param]: [string, any]) => {
             const parameter = {
                 name: name,
-                input: param["x-parameter"] ? false : true,
+                input: param["x-parameter"] ? false || param["x-parameter"] === "messages" : true,
                 type: param["x-parameter"] ? determineType(param["x-parameter"]) : "string",
                 default: param.default,
                 enum: param["enum"] ? param.enum : [],

examples/startup_technical_ideas/app.py

@@ -23,10 +23,8 @@
 
 
 @ag.entrypoint
-def chat(
-    messages: MessagesInput = MessagesInput([{"role": "string", "content": "string"}])
-) -> str:
-    messages = [{"role": "system", "content": ag.config.system_prompt}] + messages
+def chat(messages: MessagesInput = MessagesInput()) -> str:
+    messages = [{"role": "system", "content": ag.config.prompt_system}] + messages
     max_tokens = ag.config.max_tokens if ag.config.max_tokens != -1 else None
     chat_completion = client.chat.completions.create(
         model=ag.config.model,