llumo 0.2.43__py3-none-any.whl → 0.2.44__py3-none-any.whl

llumo/client.py

@@ -2231,7 +2231,9 @@ class LlumoClient:
             multiTurnChat=False,
             createMultipleLogs=True
     ):
+
         # print("Evaluating multiple data with evals:", data, evals)
+        rawData = data.copy()
         try:
             self.validateApiKey()
         except Exception as e:
@@ -2303,91 +2305,47 @@ class LlumoClient:
 
         # print("payload", payload)
 
-        # Create evaluation
-        requests.post(
-            "https://backend-api.llumo.ai/api/v1/sdk/create-evaluation-Multiple",
-            json=payload,
-            headers={
-                "Content-Type": "application/json",
-                "Authorization": f"Bearer {self.apiKey}",
-            },
+        # Create evaluation + Poll results (moved to helper)
+        final_result_data = dataPollingFuncForEval(
+            api_key=self.apiKey,
+            payload=payload,
+            data=data,
         )
-
-        final_result_data = []
-
-        cursor = "0-0"
-        limit = 10
-        all_data_fetched = False
-
-        print("✅ Evaluation Started...")
-        while not all_data_fetched:
-            try:
-                response = requests.get(
-                    "https://backend-api.llumo.ai/api/v1/sdk/poll",
-                    params={
-                        "cursor": cursor,
-                        "dataID": dataID,
-                        "limit": limit,
-                    },
-                )
-
-                response_data = response.json()
-                result_data = response_data.get("debugLog", {})
-                # print("resultData", result_data)
-
-                results = result_data.get("results", [])
-                final_result_data.extend(results)
-
-                cursor = result_data.get("nextCursor")
-
-                if len(final_result_data) == len(data):
-                    all_data_fetched = True
-
-                time.sleep(10)
-
-            except Exception as error:
-                print("error", error)
-                all_data_fetched = True
-
         # Shape results
         formatted_results = []
 
+
         for row in final_result_data:
-            score: Dict[str, float | None] = {}
-            reasoning: Dict[str, str] = {}
+            # print("ROW:  ",row)
+            result = []
 
-            for eval_name in evals:
-                details = row.get(eval_name)
+            # Extract numeric keys ("0", "1", "2", ...)
+            numeric_keys = sorted(
+                [key for key in row.keys() if str(key).strip() != "" and str(key).isdigit()],
+                key=lambda x: int(x)
+            )
 
-                if isinstance(details, dict):
-                    if isinstance(details.get("value"), (int, float)):
-                        score[eval_name] = details.get("value")
-                    else:
-                        score[eval_name] = details.get("score")
-                    reasoning[eval_name] = details.get("reasoning", "")
+            for key in numeric_keys:
+                result.append(row[key])
 
-                elif "score" in row:
-                    score[eval_name] = (
-                        row["score"] if isinstance(row["score"], (int, float)) else None
-                    )
-                    reasoning[eval_name] = row.get("reasoning", "")
-                else:
-                    score[eval_name] = None
-                    reasoning[eval_name] = ""
-
-            formatted_row = {
-                "query": row.get("query", ""),
-                "context": row.get("context", ""),
-                "output": row.get("output", ""),
-                "score": score,
-                "reasoning": reasoning,
-            }
+            evalData={}
+            for key in row:
+                if key not in numeric_keys:
+                    evalData[key]=row[key]
 
-            # print(formatted_row)
-            formatted_results.append(formatted_row)
+            # evalResultDict = {"evaluation": result}
+            evalData = {}
+            for key in row:
+                if key not in numeric_keys:
+                    evalData[key] = row[key]
 
-        return {"llumoEval": formatted_results}
+            # evalResultDict = {"evaluation": result}
 
+            evalData["evaluation"] = result
+            formatted_results.append(evalData)
+
+        return {"llumoEval": formatted_results}
+        # return formatted_results
 
     def getInsights(self,logs:List,userAim:List[str],promptTemplate:str = ""
                     ,systemInstructions:str="",multiTurnChat=False,createMultipleLogs=True):
@@ -2456,80 +2414,14 @@ class LlumoClient:
         # 1. Create Report
         print("✅ Generating Insights Now....")
         dataID = uuid.uuid4().hex[:36]
-        try:
-            payload = {
-                "data":logs,
-                "userAim":userAim,
-                "dataID":dataID
-            }
-            create_url = "https://backend-api.llumo.ai/api/v1/sdk/create-insight-report"
-            response = requests.post(create_url, json=payload)
-
-            # Check if request was successful
-            response.raise_for_status()
-
-            # print(f"Create Response: {response.json()}")
-        except requests.exceptions.RequestException as e:
-            # Check for response data in the error
-            error_data = e.response.json() if e.response else str(e)
-            print(f"Error in create request: {error_data}")
-            return
+        payload = {
+            "data":logs,
+            "userAim":userAim,
+            "dataID":dataID
+        }
 
         # 2. Poll for Results
-        # print("\n--- Starting Polling ---")
-        cursor = '0-0'
-        is_complete = False
-        max_polls = 20
-        poll_count = 0
-
-        insight_result = []
-        while not is_complete and poll_count < max_polls:
-            poll_count += 1
-
-            try:
-                poll_params = {
-                    'dataID': dataID,
-                    'cursor': cursor,
-                    'limit': 10
-                }
-                poll_url = f"https://backend-api.llumo.ai/api/v1/sdk/poll-insight-report"
-                poll_response = requests.get(poll_url, params=poll_params)
-                poll_response.raise_for_status()
-
-                data = poll_response.json()
-                # Accessing nested data: pollResponse.data.debugLog
-                debug_log = data.get('debugLog', {})
-                results = debug_log.get('results', [])
-                next_cursor = debug_log.get('nextCursor')
-
-                if results:
-                    insight_result.extend(results)
-
-                # Logic to handle cursor movement
-                if next_cursor == cursor and not results:
-                    # print("Long poll returned empty (timeout). Continuing...")
-                    pass
-                else:
-                    cursor = next_cursor
-
-                # Break condition for test (heuristic)
-                if len(insight_result):
-                    break
-
-            except requests.exceptions.RequestException as e:
-                error_msg = e.response.json() if e.response else str(e)
-                # print(f"Error in poll request: {error_msg}")
-
-                if e.response is not None and e.response.status_code == 404:
-                    # print("Resource not ready yet...")
-                    pass
-                else:
-                    # Fatal error, break the loop
-                    break
-
-            # Small delay to prevent tight loop (Equivalent to await sleep(1000))
-            time.sleep(1)
-
+        insight_result = dataPollingFuncForInsight(payload)
         # llumoInsight = formattedInsightResponse(llmResponse=insight_result)
 
         return {"llumoInsight": insight_result}

llumo/helpingFuntions.py

@@ -862,48 +862,111 @@ def addPromptAndInstructionInLogs(logData=None,promptTemplate= "",systemInstruct
     return logDataWithPrompt
 
 
-def dataPollingFuncForEval(headers,post_payload,poll_params,data_len:int):
-    postUrl = "https://backend-api.llumo.ai/api/v1/sdk/create-evaluation-Multiple"
-    pollUrl = "https://backend-api.llumo.ai/api/v1/sdk/poll"
-
-    # Create evaluation
+def dataPollingFuncForEval(api_key, payload, data, poll_interval=10, limit=10):
+    # Create evaluation (POST)
     requests.post(
-        url= postUrl,
-        json=post_payload,
-        headers=headers,
+        "https://backend-api.llumo.ai/api/v1/sdk/create-evaluation-Multiple",
+        json=payload,
+        headers={
+            "Content-Type": "application/json",
+            "Authorization": f"Bearer {api_key}",
+        },
     )
-    # print("payload", payload)
 
     final_result_data = []
+
+    cursor = "0-0"
     all_data_fetched = False
 
     print("✅ Evaluation Started...")
     while not all_data_fetched:
         try:
             response = requests.get(
-                pollUrl,
-                params=poll_params,
+                "https://backend-api.llumo.ai/api/v1/sdk/poll",
+                params={
+                    "cursor": cursor,
+                    "dataID": payload["dataID"],
+                    "limit": limit,
+                },
             )
 
             response_data = response.json()
             result_data = response_data.get("debugLog", {})
-            # print("resultData", result_data)
 
             results = result_data.get("results", [])
             final_result_data.extend(results)
 
             cursor = result_data.get("nextCursor")
 
-            if len(final_result_data) == data_len:
+            if len(final_result_data) == len(data):
                 all_data_fetched = True
 
-            time.sleep(10)
+            time.sleep(poll_interval)
 
         except Exception as error:
             print("error", error)
             all_data_fetched = True
+
     return final_result_data
 
+def dataPollingFuncForInsight(payload, poll_interval=1, limit=10, max_polls=20):
+    dataID = payload["dataID"]
+
+    # -------------------------------
+    # 1. Create Insight Report (POST)
+    # -------------------------------
+    try:
+        create_url = "https://backend-api.llumo.ai/api/v1/sdk/create-insight-report"
+        response = requests.post(create_url, json=payload)
+        response.raise_for_status()
+    except requests.exceptions.RequestException as e:
+        error_data = e.response.json() if e.response else str(e)
+        print(f"Error in create request: {error_data}")
+        return None
+
+    # -------------------------------
+    # 2. Poll Insight Results (GET)
+    # -------------------------------
+    cursor = "0-0"
+    poll_count = 0
+    insight_result = []
+
+    while poll_count < max_polls:
+        poll_count += 1
+
+        try:
+            poll_params = {
+                "dataID": dataID,
+                "cursor": cursor,
+                "limit": limit,
+            }
+
+            poll_url = "https://backend-api.llumo.ai/api/v1/sdk/poll-insight-report"
+            poll_response = requests.get(poll_url, params=poll_params)
+            poll_response.raise_for_status()
+
+            data = poll_response.json()
+            debug_log = data.get("debugLog", {})
+            results = debug_log.get("results", [])
+            next_cursor = debug_log.get("nextCursor")
+
+            if results:
+                insight_result.extend(results)
+                break  # same heuristic as original
+
+            if next_cursor != cursor:
+                cursor = next_cursor
+
+        except requests.exceptions.RequestException as e:
+            if e.response is not None and e.response.status_code == 404:
+                pass
+            else:
+                break
+
+        time.sleep(poll_interval)
+
+    return insight_result
+
 def formattedInsightResponse(llmResponse):
     try:
         response = llmResponse

{llumo-0.2.43.dist-info → llumo-0.2.44.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llumo
-Version: 0.2.43
+Version: 0.2.44
 Summary: Python SDK for interacting with the Llumo ai API.
 Home-page: https://www.llumo.ai/
 Author: Llumo

{llumo-0.2.43.dist-info → llumo-0.2.44.dist-info}/RECORD

@@ -2,19 +2,19 @@ llumo/__init__.py,sha256=kkuppu7ZPiVZFdnYzJ9BM3syMbYHOSZLpwKwAvGHsnY,311
 llumo/callback.py,sha256=XQbImLnd64_B2Iir-FCaJcL5Kmpm3RlXJH2zDRXk_yk,25135
 llumo/callbacks-0.py,sha256=TEIOCWRvk2UYsTmBMBsnlgpqWvr-2y3a6d0w_e96NRM,8958
 llumo/chains.py,sha256=6lCgLseh04RUgc6SahhmvQj82quay2Mi1j8gPUlx8Es,2923
-llumo/client.py,sha256=yuvh81zxkck-QvgqRSwTSGtLohkNBj28B_wsSf27NuQ,95904
+llumo/client.py,sha256=bXaLQc6n43GgxEEkrDZi-G7L3-1vQ7eBMozSlkyVluY,91891
 llumo/exceptions.py,sha256=lUugHX1EorGse_5dU4vBRU82TNkN6VDaAq6JGOcfzaA,2381
 llumo/execution.py,sha256=nWbJ7AvWuUPcOb6i-JzKRna_PvF-ewZTiK8skS-5n3w,1380
 llumo/functionCalling.py,sha256=D5jYapu1rIvdIJNUYPYMTyhQ1H-6nkwoOLMi6eekfUE,7241
 llumo/google.py,sha256=6y9YnDFDRHv6-sQNT5LIsV9p31BCN0B9eow5KTRBWfM,2185
-llumo/helpingFuntions.py,sha256=4ompFeWq-mr67NkbiSUGvqFnQPtffIXUIYzGyihOqLs,33083
+llumo/helpingFuntions.py,sha256=9W6q-GzrBUaHZubTVTGvcpUL9KH92CdM0ShkUScLYDM,35081
 llumo/llumoLogger.py,sha256=syFerZgosq1xm2EkE-o6xBhEg7zE07X9ASao39ZEECQ,2256
 llumo/llumoSessionContext.py,sha256=QaiQtB13dITTVINpzEAEVlO-fpW362XkgMjM1W4EHoo,14891
 llumo/models.py,sha256=aVEZsOOoQx5LeNtwSyBxqvrINq0izH3QWu_YjsMPE6o,2910
 llumo/openai.py,sha256=VstBzaORe8Tq0feUIIEszzcN1oq6TJfkPviaCr5d3Bw,8950
 llumo/sockets.py,sha256=pfWz1zTEiwqJhdbSy3i3_Y4WlIdJ3cuac11wMePeBS0,6130
-llumo-0.2.43.dist-info/licenses/LICENSE,sha256=tF9yAcfPV9xGT3ViWmC8hPvOo8BEk4ZICbUfcEo8Dlk,182
-llumo-0.2.43.dist-info/METADATA,sha256=z1TDEUY-imh53V2TxceOUO9_XXEmMuynH6RpfYEQPEc,1662
-llumo-0.2.43.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-llumo-0.2.43.dist-info/top_level.txt,sha256=d5zUTMI99llPtLRB8rtSrqELm_bOqX-bNC5IcwlDk88,6
-llumo-0.2.43.dist-info/RECORD,,
+llumo-0.2.44.dist-info/licenses/LICENSE,sha256=tF9yAcfPV9xGT3ViWmC8hPvOo8BEk4ZICbUfcEo8Dlk,182
+llumo-0.2.44.dist-info/METADATA,sha256=bUsfxsgHPfVE1YuLET9yzfyHruYMt1QSe14hVi_BQQA,1662
+llumo-0.2.44.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+llumo-0.2.44.dist-info/top_level.txt,sha256=d5zUTMI99llPtLRB8rtSrqELm_bOqX-bNC5IcwlDk88,6
+llumo-0.2.44.dist-info/RECORD,,