llumo 0.2.14b6__py3-none-any.whl → 0.2.14b7__py3-none-any.whl

llumo/client.py

@@ -25,6 +25,11 @@ postUrl = (
 fetchUrl = (
     "https://red-skull-service-392377961931.us-central1.run.app/api/get-cells-data"
 )
+socketDataUrl = "https://app.llumo.ai/api/eval/get-awaited"
+# {
+#     "workspaceID":"c9191fdf33bdd7838328c1a0",
+#     "playgroundID":"17496117244856b7815ac94004347b1c2e2f7e01600ec"
+# }
 validateUrl = "https://app.llumo.ai/api/workspace-details"
 socketUrl = "https://red-skull-service-392377961931.us-central1.run.app/"
 
@@ -89,9 +94,8 @@ class LlumoClient:
             )
             self.email = data["data"]["data"].get("email", None)
 
-            self.definationMapping[evalName] = data["data"]["data"]["analyticsMapping"][
-                evalName
-            ]
+            self.definationMapping[evalName] = data.get("data", {}).get("data", {}).get("analyticsMapping", {}).get(evalName, None)
+
         except Exception as e:
             # print(f"Error extracting data from response: {str(e)}")
             raise LlumoAIError.UnexpectedError(detail=str(e))
@@ -602,13 +606,16 @@ class LlumoClient:
             kwargs={
                 "min_wait": 40,
                 "max_wait": timeout,
-                "inactivity_timeout": 200,
+                "inactivity_timeout": 10,
                 "expected_results": expectedResults,
             },
             daemon=True,
         )
         listener_thread.start()
-
+        
+        activePlayground = f"{int(time.time() * 1000)}{uuid.uuid4()}".replace(
+                    "-", ""
+                )        
         for evalName in evals:
             # print(f"\n======= Running evaluation for: {evalName} =======")
 
@@ -656,9 +663,7 @@ class LlumoClient:
                 inputDict = {key: row[key] for key in keys if key in row}
                 output = row.get(outputColName, "")
 
-                activePlayground = f"{int(time.time() * 1000)}{uuid.uuid4()}".replace(
-                    "-", ""
-                )
+                
                 rowID = f"{int(time.time() * 1000)}{uuid.uuid4()}".replace("-", "")
                 columnID = f"{int(time.time() * 1000)}{uuid.uuid4()}".replace("-", "")
 
@@ -751,15 +756,27 @@ class LlumoClient:
         time.sleep(3)
         listener_thread.join()
 
-        raw_results = self.socket.getReceivedData()
-
+        
+        rawResults = self.socket.getReceivedData()
+        
+        # print("data from db #####################",dataFromDb)
         # Fix here: keep full keys, do not split keys
-        received_rowIDs = {key for item in raw_results for key in item.keys()}
-        expected_rowIDs = set(rowIdMapping.keys())
-        missing_rowIDs = expected_rowIDs - received_rowIDs
+        receivedRowIDs = {key for item in rawResults for key in item.keys()}
+        expectedRowIDs = set(rowIdMapping.keys())
+        missingRowIDs = expectedRowIDs - receivedRowIDs 
         # print("All expected keys:", expected_rowIDs)
         # print("All received keys:", received_rowIDs)
-        print("Missing keys:", len(missing_rowIDs))
+        # print("Missing keys:", len(missingRowIDs))
+        missingRowIDs=list(missingRowIDs)
+        
+        if len(missingRowIDs) > 0:
+            dataFromDb=fetchData(workspaceID,activePlayground,missingRowIDs)
+            rawResults.extend(dataFromDb)
+            
+            
+            
+            
+            
 
         # Initialize dataframe columns for each eval
         for eval in evals:
@@ -767,7 +784,7 @@ class LlumoClient:
             dataframe[f"{eval} Reason"] = None
 
         # Map results to dataframe rows
-        for item in raw_results:
+        for item in rawResults:
             for compound_key, value in item.items():
                 if compound_key in rowIdMapping:
                     index = rowIdMapping[compound_key]["index"]
@@ -776,6 +793,7 @@ class LlumoClient:
                     dataframe.at[index, f"{evalName} Reason"] = value.get("reasoning")
 
         self.socket.disconnect()
+        
 
         if createExperiment:
             pd.set_option("future.no_silent_downcasting", True)
@@ -805,7 +823,7 @@ class LlumoClient:
         createExperiment: bool = False,
     ) -> pd.DataFrame:
 
-        self.validateApiKey(evalName="")
+        self.validateApiKey(evalName=" ")
         workspaceID = self.workspaceID
         email = self.email
         executor = ModelExecutor(apiKey)
@@ -940,7 +958,7 @@ class LlumoClient:
         if createExperiment:
             pd.set_option("future.no_silent_downcasting", True)
             df = toolResponseDf.fillna("Some error occured")
-            if createPlayground(self.email, self.workspaceID, df):
+            if createPlayground(self.email, self.workspaceID, df,promptText=prompt_template,definationMapping=self.definationMapping):
                 print(
                     "Your data has been saved in the Llumo Experiment. Visit https://app.llumo.ai/evallm to see the results."
                 )
@@ -971,11 +989,15 @@ class LlumoClient:
             #     )
             toolResponseDf = self.evaluateMultiple(
                 toolResponseDf.to_dict(orient="records"),
-                eval=evals,
+                evals=evals,
                 prompt_template="Give answer for the given query: {{query}}",
                 outputColName=outputColName,
+                createExperiment=createExperiment
             )
-            return toolResponseDf
+            if createExperiment:
+                pass
+            else:
+                return toolResponseDf
 
         except Exception as e:
             raise e
@@ -1165,18 +1187,8 @@ class LlumoClient:
 
         workspaceID = None
         email = None
-        socketID = self.socket.connect(timeout=150)
-        self.allBatches = []
-
-        # Wait for socket connection
-        max_wait_secs = 20
-        waited_secs = 0
-        while not self.socket._connection_established.is_set():
-            time.sleep(0.1)
-            waited_secs += 0.1
-            if waited_secs >= max_wait_secs:
-                raise RuntimeError("Timeout waiting for server connection")
 
+     
         try:
             self.validateApiKey()
         except Exception as e:
@@ -1195,14 +1207,21 @@ class LlumoClient:
             elif ext in [".xlsx", ".xls"]:
                 df = pd.read_excel(file_path)
             elif ext == ".json":
-                df = pd.read_json(file_path)
+                df = pd.read_json(file_path, orient="records")
             elif ext == ".parquet":
                 df = pd.read_parquet(file_path)
             else:
                 raise ValueError(f"Unsupported file format: {ext}")
 
             # If successfully loaded, call createPlayground
-            createPlayground(self.email, self.workspaceID, df, _uploadViaSDK= True)
+            df = df.astype(str)
+            if createPlayground(self.email, self.workspaceID, df):
+                
+                print(
+                    "Your data has been saved in the Llumo Experiment. Visit https://app.llumo.ai/evallm to see the results."
+                )
+                
+                return True
 
         except Exception as e:
             print(f"Error: {e}")

llumo/helpingFuntions.py

@@ -212,8 +212,7 @@ def deleteColumnListInPlayground(workspaceID: str, playgroundID: str):
         print("❌ Error:", response.status_code, response.text)
         return None
 
-
-def createColumn(workspaceID, dataframe, playgroundID, promptText=None,queryColName=None,outputColName= "output",dataStreamName=None,definationMapping=None,uploadViaSDK = False):
+def createColumn(workspaceID, dataframe, playgroundID, promptText=None,queryColName=None,outputColName= "output",dataStreamName=None,definationMapping=None):
     if len(dataframe) > 100:
         dataframe = dataframe.head(100)
         print("⚠️ Dataframe truncated to 100 rows for upload.")
@@ -238,7 +237,7 @@ def createColumn(workspaceID, dataframe, playgroundID, promptText=None,queryColN
         columnIDMapping[col] = columnID
 
         
-        if col.startswith('output') and uploadViaSDK == False:
+        if col.startswith('output') and promptText!=None:
             # For output columns, create the prompt template with promptText
             if promptText:
                 # Extract variables from promptText and set them as dependencies
@@ -291,7 +290,7 @@ def createColumn(workspaceID, dataframe, playgroundID, promptText=None,queryColN
                     "type": "DATA_STREAM",
                     "order": indx}
 
-        elif col in allEvals and uploadViaSDK == False:
+        elif col in allEvals and promptText!=None:
 
             dependencies = []
             variables = re.findall(r'{{(.*?)}}', promptText)
@@ -341,7 +340,7 @@ def createColumn(workspaceID, dataframe, playgroundID, promptText=None,queryColN
       "order": indx
     }
 
-        elif col.endswith(' Reason'):
+        elif col.endswith(' Reason') and promptText!=None:
             continue   
 
             
@@ -374,7 +373,7 @@ def createColumn(workspaceID, dataframe, playgroundID, promptText=None,queryColN
         for col in dataframe.columns:
             columnID = columnIDMapping[col]
             
-            if col in allEvals:
+            if col in allEvals and promptText!=None:
                 row_dict[columnID] = {
                     
                     "value": row[col],
@@ -385,7 +384,7 @@ def createColumn(workspaceID, dataframe, playgroundID, promptText=None,queryColN
                     "kpi": col
                 
                     }
-            elif col.endswith(' Reason'):
+            elif col.endswith(' Reason') and promptText!=None:
                 continue
             else:# Get the columnID from the mapping
                 row_dict[columnID] = row[col]
@@ -397,6 +396,7 @@ def createColumn(workspaceID, dataframe, playgroundID, promptText=None,queryColN
 
     # Return the column template, row template, and the column ID mapping
     return coltemplate, rowTemplate
+
 def uploadColumnListInPlayground(payload):
     url = uploadColList
     headers = {
@@ -440,15 +440,14 @@ def uploadRowsInDBPlayground(payload):
         return None
 
 
-def createPlayground(email, workspaceID, df, promptText=None,queryColName=None,dataStreamName=None,definationMapping=None,outputColName="output",_uploadViaSDK = False):
+def createPlayground(email, workspaceID, df, promptText=None,queryColName=None,dataStreamName=None,definationMapping=None,outputColName="output"):
     
     playgroundId = str(createEvalPlayground(email=email, workspaceID=workspaceID))
     payload1, payload2 = createColumn(
-        workspaceID=workspaceID, dataframe=df, playgroundID=playgroundId, promptText=promptText,queryColName=queryColName,dataStreamName=dataStreamName,definationMapping=definationMapping,outputColName=outputColName,uploadViaSDK=_uploadViaSDK
+        workspaceID=workspaceID, dataframe=df, playgroundID=playgroundId, promptText=promptText,queryColName=queryColName,dataStreamName=dataStreamName,definationMapping=definationMapping,outputColName=outputColName
     )
     
-    
-    
+ # Debugging line to check the payload2 structure
     deleteExistingRows = deleteColumnListInPlayground(
         workspaceID=workspaceID, playgroundID=playgroundId
     )
@@ -460,6 +459,7 @@ def createPlayground(email, workspaceID, df, promptText=None,queryColName=None,d
 
 
 
+
 def getPlaygroundInsights(workspaceID: str, activePlayground: str):
     headers = {
         
@@ -563,4 +563,46 @@ def checkDependency(selectedEval, columns,tocheck=True):
                     }
         return {"status":True,"message":"success"}
     else:
-        return {"status":True,"message":"success"}
+        return {"status":True,"message":"success"}
+    
+
+def fetchData(workspaceID, playgroundID, missingList: list):
+    # Define the URL and prepare the payload
+    socket_data_url = "https://app.llumo.ai/api/eval/get-awaited"
+    payload = {
+        "workspaceID": workspaceID,
+        "playgroundID": playgroundID,
+        "missingList": missingList
+    }
+    
+    try:
+        # Send a POST request to the API
+        response = requests.post(socket_data_url, json=payload)
+        
+        # Check if the response is successful
+        if response.status_code == 200:
+            # Parse the JSON data from the response
+            data = response.json().get("data", {})
+            
+            
+            # Prepare the list of all data values in the desired format
+            result_list = []
+            for key, value in data.items():
+                # Create a dictionary for each item in the response data
+                result_list.append({
+                    key: {
+                        "value": value.get("value"),
+                        "reasoning": value.get("reasoning"),
+                        "edgeCase": value.get("edgeCase"),
+                        "kpi": value.get("kpi")
+                    }
+                })
+            
+            return result_list
+        else:
+            print(f"Failed to fetch data. Status Code: {response.status_code}")
+            return []
+
+    except Exception as e:
+        print(f"An error occurred: {e}")
+        return []

llumo/sockets.py

@@ -17,10 +17,10 @@ class LlumoSocketClient:
 
         # Initialize client
         self.sio = socketio.Client(
-            logger=True,
-            engineio_logger=True,
+            logger=False,
+            engineio_logger=False,
             reconnection=True,
-            reconnection_attempts=10,
+            reconnection_attempts=1,
             reconnection_delay=1,
         )
 

{llumo-0.2.14b6.dist-info → llumo-0.2.14b7.dist-info}/METADATA

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

llumo-0.2.14b7.dist-info/RECORD

@@ -0,0 +1,13 @@
+llumo/__init__.py,sha256=O04b4yW1BnOvcHzxWFddAKhtdBEhBNhLdb6xgnpHH_Q,205
+llumo/client.py,sha256=HpvUyucrGPbcPQMz_cTRDcEsBFpmNt8jfW1zJU4Nyss,46781
+llumo/exceptions.py,sha256=i3Qv4_g7XjRuho7-b7ybjw2bwSh_NhvICR6ZAgiLQX8,1944
+llumo/execution.py,sha256=x88wQV8eL99wNN5YtjFaAMCIfN1PdfQVlAZQb4vzgQ0,1413
+llumo/functionCalling.py,sha256=D5jYapu1rIvdIJNUYPYMTyhQ1H-6nkwoOLMi6eekfUE,7241
+llumo/helpingFuntions.py,sha256=RgWok8DoE1R-Tc0kJ9B5En6LEUEk5EvQU8iJiGPbUsw,21911
+llumo/models.py,sha256=YH-qAMnShmUpmKE2LQAzQdpRsaXkFSlOqMxHwU4zBUI,1560
+llumo/sockets.py,sha256=I2JO_eNEctRo_ikgvFVp5zDd-m0VDu04IEUhhsa1Tic,5950
+llumo-0.2.14b7.dist-info/licenses/LICENSE,sha256=tF9yAcfPV9xGT3ViWmC8hPvOo8BEk4ZICbUfcEo8Dlk,182
+llumo-0.2.14b7.dist-info/METADATA,sha256=kdeDmcNgV8uRyH7gXhhAqeb3se5U_Gqo3bA3Cf4SLlM,1521
+llumo-0.2.14b7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+llumo-0.2.14b7.dist-info/top_level.txt,sha256=d5zUTMI99llPtLRB8rtSrqELm_bOqX-bNC5IcwlDk88,6
+llumo-0.2.14b7.dist-info/RECORD,,

llumo-0.2.14b6.dist-info/RECORD

@@ -1,13 +0,0 @@
-llumo/__init__.py,sha256=O04b4yW1BnOvcHzxWFddAKhtdBEhBNhLdb6xgnpHH_Q,205
-llumo/client.py,sha256=YmvbfyWR9YCDOFrKM0nwDMWYLGpu4RSZwbkiUJ3e78M,46162
-llumo/exceptions.py,sha256=i3Qv4_g7XjRuho7-b7ybjw2bwSh_NhvICR6ZAgiLQX8,1944
-llumo/execution.py,sha256=x88wQV8eL99wNN5YtjFaAMCIfN1PdfQVlAZQb4vzgQ0,1413
-llumo/functionCalling.py,sha256=D5jYapu1rIvdIJNUYPYMTyhQ1H-6nkwoOLMi6eekfUE,7241
-llumo/helpingFuntions.py,sha256=f2Y-x-DbGk3E29qaJWDOsTkuqqDFl9-VQTRM490amE4,20443
-llumo/models.py,sha256=YH-qAMnShmUpmKE2LQAzQdpRsaXkFSlOqMxHwU4zBUI,1560
-llumo/sockets.py,sha256=-zJYRCDRwElIPr5iOFqzQxjecuLJ7mztiyYJz14pGLY,5949
-llumo-0.2.14b6.dist-info/licenses/LICENSE,sha256=tF9yAcfPV9xGT3ViWmC8hPvOo8BEk4ZICbUfcEo8Dlk,182
-llumo-0.2.14b6.dist-info/METADATA,sha256=2Yl4gnAXsfpJWLB6mhlza0HUE76uJY3sC1TWK7GlUu4,1521
-llumo-0.2.14b6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-llumo-0.2.14b6.dist-info/top_level.txt,sha256=d5zUTMI99llPtLRB8rtSrqELm_bOqX-bNC5IcwlDk88,6
-llumo-0.2.14b6.dist-info/RECORD,,