Implement complete data types

Signed-off-by: Merwane Hamadi <merwanehamadi@gmail.com>
Significant-Gravitas · Jun 21, 2023 · 0c39937 · 0c39937
1 parent b4f2077
commit 0c39937
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 14 deletions.
diff --git a/autogpt/app.py b/autogpt/app.py
@@ -53,7 +53,7 @@ def get_command(
         if not isinstance(assistant_reply_json, dict):
             return (
                 "Error:",
-                f"'assistant_reply_json' object is not dictionary {assistant_reply_json}",
+                f"The previous message sent was not a dictionary {assistant_reply_json}",
             )
 
         command = assistant_reply_json["command"]

diff --git a/autogpt/llm/base.py b/autogpt/llm/base.py
@@ -2,7 +2,9 @@
 
 from dataclasses import dataclass, field
 from math import ceil, floor
-from typing import Any, Dict, List, Literal, TypedDict
+from typing import List, Literal, TypedDict
+
+from autogpt.models.command_argument import CommandArgument
 
 MessageRole = Literal["system", "user", "assistant"]
 MessageType = Literal["ai_response", "action_result"]
@@ -157,7 +159,7 @@ class ChatModelResponse(LLMResponse):
     """Standard response struct for a response from an LLM model."""
 
     content: str = None
-    function_call: Dict[str, Any] = None
+    function_call: OpenAIFunctionCall = None
 
 
 @dataclass
@@ -166,4 +168,23 @@ class OpenAIFunctionSpec:
 
     name: str
     description: str
-    parameters: dict[str, Any]
+    parameters: OpenAIFunctionParameter
+
+
+@dataclass
+class OpenAIFunctionCall:
+    name: str
+    arguments: List[CommandArgument]
+
+
+@dataclass
+class OpenAIFunctionParameter:
+    type: str
+    properties: OpenAIFunctionProperties
+    required: bool
+
+
+@dataclass
+class OpenAIFunctionProperties:
+    type: str
+    description: str
diff --git a/autogpt/llm/providers/openai.py b/autogpt/llm/providers/openai.py
@@ -13,6 +13,8 @@
     ChatModelInfo,
     EmbeddingModelInfo,
     MessageDict,
+    OpenAIFunctionParameter,
+    OpenAIFunctionProperties,
     OpenAIFunctionSpec,
     TextModelInfo,
     TText,
@@ -282,18 +284,18 @@ def get_openai_command_specs(agent) -> list[OpenAIFunctionSpec]:
         required = []
 
         for argument in command.arguments:
-            properties[argument.name] = {
-                "type": argument.type,
-                "description": argument.description,
-            }
+            properties[argument.name] = OpenAIFunctionProperties(
+                type=argument.type,
+                description=argument.description,
+            )
             if argument.required:
                 required.append(argument.name)
+        parameters = OpenAIFunctionParameter(
+            type="object",
+            properties=properties,
+            required=required,
+        )
 
-        parameters = {
-            "type": "object",
-            "properties": properties,
-            "required": required,
-        }
         functions.append(
             OpenAIFunctionSpec(
                 name=command.name,

diff --git a/autogpt/llm/utils/__init__.py b/autogpt/llm/utils/__init__.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from dataclasses import asdict
 from typing import List, Literal, Optional
 
 from colorama import Fore
@@ -139,7 +140,7 @@ def create_chat_completion(
         ] = config.get_azure_deployment_id_for_model(model)
     if functions:
         chat_completion_kwargs["functions"] = [
-            function.__dict__ for function in functions
+            asdict(function) for function in functions
         ]
 
     response = iopenai.create_chat_completion(