Fix merge issues

Author: lrafeei

tests/mlmodel_langchain/test_chain.py

@@ -406,6 +406,8 @@
             "input": "[[3923, 374, 220, 17, 489, 220, 19, 30]]",
             "request.model": "text-embedding-ada-002",
             "request_id": None,
+            "response.model": "text-embedding-ada-002-v2",
+            "response.organization": "nr-test-org",
             "response.headers.llmVersion": "2020-10-01",
             "response.headers.ratelimitLimitRequests": 10000,
             "response.headers.ratelimitLimitTokens": 50000000,
@@ -428,6 +430,8 @@
             "input": "[[10590]]",
             "request.model": "text-embedding-ada-002",
             "request_id": None,
+            "response.model": "text-embedding-ada-002-v2",
+            "response.organization": "nr-test-org",
             "response.headers.llmVersion": "2020-10-01",
             "response.headers.ratelimitLimitRequests": 10000,
             "response.headers.ratelimitLimitTokens": 50000000,
@@ -525,6 +529,7 @@
             "ingest_source": "Python",
             "request.model": "gpt-3.5-turbo",
             "request_id": None,
+            "response.model": "gpt-3.5-turbo-0125",
             "response.choices.finish_reason": "stop",
             "response.headers.llmVersion": "2020-10-01",
             "response.headers.ratelimitLimitRequests": 10000,
@@ -558,6 +563,8 @@
             "timestamp": None,
             "trace_id": "trace-id",
             "vendor": "openai",
+            "token_count": 0,
+            "content": "You are a generator of quiz questions for a seminar. Use the following pieces of retrieved context to generate 5 multiple choice questions (A,B,C,D) on the subject matter. Use a three sentence maximum and keep the answer concise. Render the output as HTML\n\nWhat is 2 + 4?",
         },
     ],
     [
@@ -566,7 +573,6 @@
             "completion_id": None,
             "content": "math",
             "id": None,
-            "ingest_source": "Python",
             "request_id": None,
             "response.model": "gpt-3.5-turbo-0125",
             "role": "user",
@@ -620,8 +626,6 @@
             "   Answer: A) 64\n"
             "```\n",
             "id": None,
-            "ingest_source": "Python",
-            "is_response": True,
             "request_id": None,
             "response.model": "gpt-3.5-turbo-0125",
             "role": "assistant",