DynamicFormOrchestrator

.hintrc

@@ -0,0 +1,13 @@
+{
+  "extends": [
+    "development"
+  ],
+  "hints": {
+    "axe/forms": [
+      "default",
+      {
+        "select-name": "off"
+      }
+    ]
+  }
+}

app.py

@@ -197,19 +197,29 @@ def should_use_data():
 
     return False
 
+
 @app.route("/conversation", methods=["GET", "POST"])
 def conversation():
     message_uuid = str(uuid.uuid4())
-    request_body = request.json
-    return conversation_internal(request_body, message_uuid)
-
-def conversation_internal(request_body, message_uuid):
+    request_body = None
+    file = request.files.get("file", None)
+
+    request_body = {}
+    for key in request.form:
+        try:
+            request_body[key] = json.loads(request.form[key])
+        except json.JSONDecodeError:
+            request_body[key] = request.form[key]
+    return conversation_internal(request_body, message_uuid, file)
+
+def conversation_internal(request_body, message_uuid, file=None):
     try:
+        print(request_body)
         use_data = should_use_data()
         if use_data:
-            return orchestrator.conversation_with_data(request_body, message_uuid)
+            return orchestrator.conversation_with_data(request_body, message_uuid, file)
         else:
-            return orchestrator.conversation_without_data(request_body, message_uuid)
+            return orchestrator.conversation_without_data(request_body, message_uuid, file)
     except Exception as e:
         logging.exception("Exception in /conversation")
         return jsonify({"error": str(e)}), 500

appsvc.yaml

@@ -0,0 +1,5 @@
+version: 1
+
+pre-build: |
+  export POETRY_HTTP_BASIC_TNRDEV_USERNAME=agent
+  export POETRY_HTTP_BASIC_TNRDEV_PASSWORD=$AZURE_ARTIFACTS_PAT

backend/orchestrators/AdvancedOrchestrator.py

@@ -13,7 +13,7 @@ def __init__(self):
         self.load_balancer = LoadBalancer()
 
     # Post chat info if data configured
-    def conversation_with_data(self, request_body, message_uuid):
+    def conversation_with_data(self, request_body, message_uuid, file=None):
         logging.debug(f"ADV ORCH COVO W/ DATA")
         # Get a weighted random OpenAIContext object
         openai_context = self.load_balancer.get_openai_context()
@@ -57,7 +57,7 @@ def conversation_with_data(self, request_body, message_uuid):
             return Response(super().stream_with_data(body, headers, endpoint, message_uuid, history_metadata), mimetype='text/event-stream')
 
     # Post chat info if data not configured
-    def conversation_without_data(self, request_body, message_uuid):
+    def conversation_without_data(self, request_body, message_uuid, file=None):
         # Get a weighted random OpenAIContext object
         openai_context = self.load_balancer.get_openai_context()
 

backend/orchestrators/DefaultOrchestrator.py

@@ -4,7 +4,7 @@
 
 class DefaultOrchestrator(Orchestrator):
     # Post chat info if data configured
-    def conversation_with_data(self, request_body, message_uuid):
+    def conversation_with_data(self, request_body, message_uuid, file=None):
         # Set up request variables
         body, headers = super().prepare_body_headers_with_data(request)
         base_url = super().AZURE_OPENAI_ENDPOINT if super().AZURE_OPENAI_ENDPOINT else f"https://{super().AZURE_OPENAI_RESOURCE}.openai.azure.com/"
@@ -32,7 +32,7 @@ def conversation_with_data(self, request_body, message_uuid):
             return Response(super().stream_with_data(body, headers, endpoint, message_uuid, history_metadata), mimetype='text/event-stream')
 
     # Post chat info if data not configured
-    def conversation_without_data(self, request_body, message_uuid):
+    def conversation_without_data(self, request_body, message_uuid, file=None):
         # Setup for direct query to OpenAI
         openai.api_type = "azure"
         openai.api_base = super().AZURE_OPENAI_ENDPOINT if super().AZURE_OPENAI_ENDPOINT else f"https://{super().AZURE_OPENAI_RESOURCE}.openai.azure.com/"
@@ -50,11 +50,20 @@ def conversation_without_data(self, request_body, message_uuid):
 
         for message in request_messages:
             if message:
+                # if message starts with User Provided File: then skip
+                if message["content"].startswith("User Provided File: "):
+                    continue
                 messages.append({
                     "role": message["role"] ,
-                    "content": message["content"]
+                    "content": f"{message['content']}"
                 })
 
+        if(file):
+            messages.append({
+                "role": "user",
+                "content": f"User Provided File: {super().parse_file(file)}"
+            })
+
         history_metadata = request_body.get("history_metadata", {})
         history_metadata = super().conversation_client.create_conversation_item(
             request_body,