Merge pull request #75 from pattern-tech/refactor/ai-v2

Remove unused environment variables and improve contract function output handling

Author: yasinfakhar

docker-compose.yml

@@ -21,20 +21,6 @@ services:
     restart: always
     environment:
       MODULE_NAME: src.main
-      OPENAI_API_KEY: ${OPENAI_API_KEY}
-      POSTGRES_HOST: ${POSTGRES_HOST}
-      POSTGRES_PORT: ${POSTGRES_PORT}
-      POSTGRES_DB: ${POSTGRES_DB}
-      POSTGRES_USERNAME: ${POSTGRES_USERNAME}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      JWT_SECRET_KEY: ${JWT_SECRET_KEY}
-      AWS_ACCESS_KEY: ${AWS_ACCESS_KEY}
-      AWS_SECRET_KEY: ${AWS_SECRET_KEY}
-      AWS_REGION: ${AWS_REGION}
-      AWS_S3_ENDPOINT: ${AWS_S3_ENDPOINT}
-      AWS_S3_BUCKET_NAME: ${AWS_S3_BUCKET_NAME}
-      QDRANT_URL: ${QDRANT_URL}
-      QDRANT_COLLECTION: ${QDRANT_COLLECTION}
     volumes:
       - .:/app
     ports:

src/agentflow/providers/chain_scan_tools.py

@@ -684,6 +684,9 @@ def call_contract_function(contract_address: str, chain_id: str, function_name:
             raise Exception(
                 f"Function '{function_name}' is not a read-only function and might modify state or require a transaction.")
 
+        # Get function outputs for later use
+        function_outputs = function_entry.get('outputs', [])
+
         # Call the function with provided parameters
         result = function_obj(*function_params).call()
 
@@ -697,41 +700,44 @@ def call_contract_function(contract_address: str, chain_id: str, function_name:
         elif isinstance(result, bytes):
             processed_result = web3.to_hex(result)
             result_type = "bytes (hex)"
-        elif isinstance(result, tuple):
-            # Handle named tuples (common in Solidity returns)
-            if hasattr(result, '_asdict'):
-                processed_result = dict(result._asdict())
-                result_type = "struct"
-            else:
-                processed_result = list(result)
-                result_type = "tuple"
-
-            # Convert any bytes in the result to hex
-            if isinstance(processed_result, dict):
-                for key, value in processed_result.items():
+        # Handle both tuple and list results - Web3.py may return either depending on the version
+        elif isinstance(result, (tuple, list)):
+            # If we have output definitions, create a dictionary with proper names
+            if function_outputs and len(function_outputs) == len(result):
+                processed_result = {}
+                for i, output in enumerate(function_outputs):
+                    output_name = output.get('name')
+                    if not output_name:  # If name is empty, use index
+                        output_name = f"output_{i}"
+
+                    value = result[i]
+                    processed_result[output_name] = value
+
+                    # Handle special types
                     if isinstance(value, bytes):
-                        processed_result[key] = web3.to_hex(value)
-                    # Large ints might be wei values
+                        processed_result[output_name] = web3.to_hex(value)
+                    # For large integers, preserve the original value
+                    # but also provide the ether conversion for convenience
                     elif isinstance(value, int) and value > 10**10:
-                        processed_result[f"{key}_eth"] = web3.from_wei(
+                        processed_result[f"{output_name}_eth"] = web3.from_wei(
                             value, 'ether')
-            elif isinstance(processed_result, list):
+
+                result_type = "struct"
+            else:
+                # Fallback to list if we can't match outputs
+                processed_result = list(result)
                 processed_result = [web3.to_hex(v) if isinstance(
                     v, bytes) else v for v in processed_result]
-        elif isinstance(result, list):
-            processed_result = result
-            result_type = "array"
-            # Convert any bytes in the list to hex
-            for i, item in enumerate(processed_result):
-                if isinstance(item, bytes):
-                    processed_result[i] = web3.to_hex(item)
+                result_type = "tuple"
 
-        return {
+        response = {
             "success": True,
             "result": processed_result,
-            "result_type": result_type
+            "result_type": function_outputs,
         }
 
+        return response
+
     except Exception as e:
         return {
             "success": False,

src/conversation/routers/playground_conversation_router.py

@@ -58,22 +58,22 @@ class CreateConversationInput(BaseModel):
     name: str
     project_id: UUID
     conversation_id: Optional[UUID] = None
-    created_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
-    updated_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
-    deleted_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
 
     class Config:
         from_attributes = True
 
 
 class ConversationOutput(BaseModel):
-    """
+    """`
     Schema for conversation output.
     """
     id: UUID
     name: str
     project_id: UUID
     chat_history: List[Dict]
+    created_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
+    updated_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
+    deleted_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
 
     class Config:
         from_attributes = True