llumo 0.2.38__tar.gz → 0.2.40__tar.gz

{llumo-0.2.38/llumo.egg-info → llumo-0.2.40}/PKG-INFO

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

{llumo-0.2.38 → llumo-0.2.40}/llumo/callback.py

@@ -1,3 +1,4 @@
+from logging import lastResort
 from typing import Any, Dict, List
 from langchain_core.callbacks.base import BaseCallbackHandler
 from langchain_core.messages import BaseMessage
@@ -17,7 +18,7 @@ class LlumoCallbackHandler(BaseCallbackHandler):
             raise ValueError("LlumoSessionContext is required")
 
         self.sessionLogger = session
-        self.sessionLogger.isLangchain = True
+        self.sessionLogger.logger.isLangchain = True
         self.agentType = agentType
 
         # Initialize timing and state variables
@@ -30,6 +31,7 @@ class LlumoCallbackHandler(BaseCallbackHandler):
         # Initialize tracking variables
         self.prompt = ""
         self.searchQuery = ""
+        self.currentInputTokens = 0
         self.currentToolName = None
         self.currentToolInput = None
         self.currentAgentName = None
@@ -48,8 +50,7 @@ class LlumoCallbackHandler(BaseCallbackHandler):
         self.currentAction = ""
         self.currentObservation = ""
         self.isAgentExecution = False
-
-
+        self.availableTools = None
 
     def on_chain_start(self, serialized: Dict[str, Any], inputs: Dict[str, Any], **kwargs: Any) -> None:
         """Called when a chain starts - this includes agent execution"""
@@ -86,8 +87,9 @@ class LlumoCallbackHandler(BaseCallbackHandler):
                 elif "id" in serialized and isinstance(serialized["id"], list):
                     self.currentAgentName = serialized["id"][-1] if serialized["id"] else "unknown"
                 else:
-                    self.currentAgentName = "unknown"
-
+                    self.currentAgentName = kwargs.get("name","unknown")
+            else:
+                self.currentAgentName = kwargs.get("name", "unknown")
             # Check if this is agent execution
             if ("agent" in str(self.currentAgentName).lower() or
                     (serialized and serialized.get("_type") == "agent_executor") or
@@ -124,6 +126,9 @@ class LlumoCallbackHandler(BaseCallbackHandler):
 
     def on_chain_end(self, outputs: Dict[str, Any], **kwargs: Any) -> None:
         """Called when a chain ends"""
+        # print("ON CHAIN END: ",outputs)
+        # print("ON CHAIN END: ",kwargs)
+
         try:
             if self.isAgentExecution and isinstance(outputs, dict) and "output" in outputs:
                 # Use logAgentStep for final completion
@@ -147,16 +152,27 @@ class LlumoCallbackHandler(BaseCallbackHandler):
 
     def on_llm_start(self, serialized: Dict[str, Any], prompts: List[Any], **kwargs: Any) -> None:
         """Called when LLM starts"""
+        # print("ON LLM START: ",serialized)
+        # print("ON LLM START: ", prompts)
+        # print("ON LLM START: ", kwargs)
+        try:
+            self.availableTools = kwargs["invocation_params"]["functions"]
+        except:
+            self.availableTools = []
+
+
         self.llmStartTime = time.time()
         self.stepTime = time.time()
-
+        # print(prompts)
         if self.prompt == "":
             match = re.search(r"Human:\s*(.*)",prompts[0], re.DOTALL)
+            # allPromptInstructions = " ".join(prompts)
             if match:
                 user_question = match.group(1).strip()
                 self.prompt = user_question # 👉 What is LangChain?
             else:
                 self.prompt = ""
+                # self.allPrompt = allPromptInstructions
 
         # Dynamically get model info
         model = "unknown"
@@ -244,9 +260,11 @@ class LlumoCallbackHandler(BaseCallbackHandler):
         # Ensure we have string values
         output = str(output) if output is not None else ""
         model_name = str(model_name) if model_name is not None else "unknown"
+        self.currentInputTokens = input_tokens
 
         # Parse ReAct reasoning from LLM output if we're in agent execution
         if self.isAgentExecution and output:
+            # print("[AGENT EXECUTOR OUTPUT]")
             self._parse_react_reasoning(output)
         try:
             self.sessionLogger.logLlmStep(
@@ -286,7 +304,7 @@ class LlumoCallbackHandler(BaseCallbackHandler):
                 retrieverSource = str(source),
                 topK = len(documents),
                 chunkSize =  chunkSize,
-                context =  [doc.page_content for doc in documents],
+                context =  " ".join([doc.page_content for doc in documents]),
                 searchQuery =  self.prompt if self.prompt != "" else self.searchQuery,
                 latencyMs = 120,  # mock latency, replace with real timing if needed
                 status = "SUCCESS"
@@ -385,6 +403,9 @@ class LlumoCallbackHandler(BaseCallbackHandler):
         # print(f"[DEBUG] Tool started: {self.currentToolName} with input: {input_str}")
 
     def on_tool_end(self, output: Any, **kwargs: Any) -> None:
+        # print("ON TOOL END: ",output)
+        # print("ON TOOL END: ",kwargs)
+
         """Called when a tool completes execution"""
         duration_ms = int((time.time() - self.toolStartTime) * 1000) if self.toolStartTime else 0
 
@@ -423,7 +444,9 @@ class LlumoCallbackHandler(BaseCallbackHandler):
     def on_agent_action(self, action: AgentAction, **kwargs: Any) -> None:
         """Called when an agent takes an action"""
         self.agentsSteps += 1
+
         # print("ON AGENT ACTION: ", action)
+        # print("ON AGENT ACTION: ", kwargs)
 
         try:
             # Dynamically extract information from action
@@ -452,7 +475,7 @@ class LlumoCallbackHandler(BaseCallbackHandler):
                 agentType=self.agentType,
                 agentName=self.currentAgentName or "unknown",
                 numStepsTaken=self.agentsSteps,
-                tools=[tool_name],
+                tools=self.availableTools,
                 query=self.prompt,
                 status=current_status,
                 # message=f"Executing {tool_name} with input: {tool_input}. Reasoning: {reasoning_text}",
@@ -471,7 +494,7 @@ class LlumoCallbackHandler(BaseCallbackHandler):
 
     def on_agent_error(self, error: Exception, **kwargs: Any) -> None:
         """Called when an agent encounters an error"""
-        # print("ITS A AGENT ERROR:", error)
+        # print("ON AGENT ERROR:", error)
         self.hasErrors = True
         self.lastError = str(error)
 
@@ -491,6 +514,8 @@ class LlumoCallbackHandler(BaseCallbackHandler):
 
     def on_tool_error(self, error: Exception, **kwargs: Any) -> None:
         """Called when a tool encounters an error"""
+        # print("ON TOOL ERROR: ",error)
+        # print("ON TOOL ERROR: ", kwargs)
 
         self.hasErrors = True
         self.lastError = str(error)
@@ -517,6 +542,8 @@ class LlumoCallbackHandler(BaseCallbackHandler):
     def on_chain_error(self, error: Exception, **kwargs: Any) -> None:
         """Called when a chain encounters an error"""
         # print("ITS A CHAIN ERROR:", error)
+        # print("ITS A CHAIN ERROR:", kwargs)
+
         self.hasErrors = True
         self.lastError = str(error)
 
@@ -542,13 +569,13 @@ class LlumoCallbackHandler(BaseCallbackHandler):
                     stepName="Chain Execution Error",
                     model="unknown",
                     provider=self.llmProvider,
-                    inputTokens=0,
+                    inputTokens=self.currentInputTokens,
                     outputTokens=0,
                     # temperature=0.0,
                     # promptTruncated=False,
                     latencyMs=0,
                     prompt=self.prompt,
-                    output="",
+                    output=self.lastError,
                     status="FAILURE",
                     # message=str(error),
                 )

{llumo-0.2.38 → llumo-0.2.40}/llumo/client.py

@@ -779,7 +779,8 @@ class LlumoClient:
     def debugLogs(
             self,
             data,
-            prompt_template="",
+            promptTemplate="",
+            systemInstructions = ""
 
     ):
         if isinstance(data, dict):
@@ -830,15 +831,15 @@ class LlumoClient:
             context = ""
 
             # Process prompt template if provided
-            if prompt_template:
+            if promptTemplate:
                 # Extract template variables
-                keys = re.findall(r"{{(.*?)}}", prompt_template)
+                keys = re.findall(r"{{(.*?)}}", promptTemplate)
 
                 if not all([key in dataframe.columns for key in keys]):
                     raise LlumoAIError.InvalidPromptTemplate()
 
                 # Populate template and separate query/context
-                populated_template = prompt_template
+                populated_template = promptTemplate
                 for key in keys:
                     value = row.get(key, "")
                     if isinstance(value, str):
@@ -908,7 +909,10 @@ class LlumoClient:
                 "createdAt":createdAt,
                 "columnID":rowID,
                 "rowID":columnID,
-                "latency": random.randint(1000, 1500)
+                "latency": random.randint(1000, 1500),
+                "promptTemplate":promptTemplate,
+                "systemInstructions":systemInstructions
+
             }
 
             allBatches.append(batch)
@@ -918,7 +922,7 @@ class LlumoClient:
 
             try:
                 # print(batch)
-                response = postForListOfSteps(record=batch,workspaceID=workspaceID)
+                response = postForDebugLogs(record=batch,workspaceID=workspaceID)
 
                 # failure case inside response
                 if isinstance(response, dict) and str(response.get("status", "")).lower() == "false":

{llumo-0.2.38 → llumo-0.2.40}/llumo/helpingFuntions.py

@@ -740,7 +740,7 @@ def getCustomAnalytics(workspaceID):
 
 
 
-def postForListOfSteps(record: {},workspaceID):
+def postForDebugLogs(record: {},workspaceID):
     url = "https://backend-api.llumo.ai/api/v1/get-debug-log-for-upload"
     payload = record
     workspaceID = workspaceID
@@ -763,3 +763,74 @@ def postForListOfSteps(record: {},workspaceID):
 
     except Exception as e:
         return  {"status":"False","exception": str(e)}
+
+
+def removeLLmStep(run: dict) -> dict:
+    """
+    Remove LLM steps that appear immediately before an AGENT step.
+    
+    """
+
+    if not run or "steps" not in run:
+        return run
+
+    steps = run["steps"]
+    indices_to_remove = set()
+    llm_stack = []  # stack of indices where stepType == "LLM"
+
+    for idx, step in enumerate(steps):
+        step_type = step.get("stepType")
+
+        if step_type == "LLM":
+            llm_stack.append(idx)
+
+        elif step_type == "AGENT":
+            if llm_stack:
+                last_llm_idx = llm_stack[-1]
+
+                # ✅ Only remove if LLM is immediately before AGENT
+                if last_llm_idx == idx - 1:
+                    indices_to_remove.add(last_llm_idx)
+                    llm_stack.pop()  # matched, so pop
+
+    # Rebuild steps excluding removed indices
+    cleaned_steps = [
+        step for i, step in enumerate(steps)
+        if i not in indices_to_remove
+    ]
+
+    run["steps"] = cleaned_steps
+    return run
+
+
+def addSelectedTools(run: dict) -> dict:
+    """
+    Populate metadata.toolSelected in AGENT steps based on TOOL executions.
+    """
+
+    if not run or "steps" not in run:
+        return run
+
+    steps = run["steps"]
+    current_agent_step = None
+
+    for step in steps:
+        step_type = step.get("stepType")
+
+        # Track the most recent AGENT step
+        if step_type == "AGENT":
+            current_agent_step = step
+
+            # Ensure toolSelected exists
+            metadata = current_agent_step.get("metadata", {})
+            metadata.setdefault("toolSelected", [])
+            current_agent_step["metadata"] = metadata
+
+        # When TOOL is executed, attach it to last AGENT
+        elif step_type == "TOOL" and current_agent_step:
+            tool_name = step.get("metadata", {}).get("toolName")
+
+            if tool_name:
+                current_agent_step["metadata"]["toolSelected"].append(tool_name)
+
+    return run

{llumo-0.2.38 → llumo-0.2.40}/llumo/llumoLogger.py

@@ -8,6 +8,7 @@ class LlumoLogger:
         self.workspaceID = None
         self.playgroundID = None
         self.userEmailID = None
+        self.isLangchain = False
         self._authenticate()
 
     def _authenticate(self):

{llumo-0.2.38 → llumo-0.2.40}/llumo/llumoSessionContext.py

@@ -1,3 +1,4 @@
+
 import contextvars
 import uuid
 from typing import Optional, List, Dict, Any
@@ -6,7 +7,8 @@ import requests
 from .client import LlumoClient
 import math
 import base64
-
+from .helpingFuntions import removeLLmStep
+from .helpingFuntions import addSelectedTools
 import random
 
 _ctxLogger = contextvars.ContextVar("ctxLogger")
@@ -35,7 +37,7 @@ class LlumoSessionContext(LlumoClient):
         self.threadLogger = None
         self.threadSessionID = None
         self.threadLlumoRun = None
-        self.isLangchain = False
+
 
     def start(self):
         self.threadLogger = _ctxLogger.set(self.logger)
@@ -57,9 +59,9 @@ class LlumoSessionContext(LlumoClient):
         self.end()
 
 
-    def startLlumoRun(self, runName: str, rowID: str = "", columnID: str = "", runID: str = None):
+    def startLlumoRun(self, runName: str,promptTemplate:str = "",systemInstructions:str = "", rowID: str = "", columnID: str = "", runID: str = None):
 
-        if runID is None:
+        if runID == None:
             LlumoRunID = str(uuid.uuid4().hex[:16])
         else:
             LlumoRunID = runID
@@ -82,7 +84,7 @@ class LlumoSessionContext(LlumoClient):
             "sessionID": self.sessionID,
             "playgroundID": self.logger.getPlaygroundID(),
             "workspaceID": self.logger.getWorkspaceID(),
-            "source": "SDK_LANGCHAIN" if self.isLangchain  else "SDK_OTHERS",
+            "source": "SDK_LANGCHAIN" if self.logger.isLangchain  else "SDK_OTHERS",
             "rowID": rowID,
             "columnID": columnID,
             "email": self.logger.getUserEmailID(),
@@ -100,8 +102,9 @@ class LlumoSessionContext(LlumoClient):
                 "totalTokens": "",
                 "cost": "",
                 "modelsUsed": "gpt-4o",
-
-                       }
+                       },
+            "promptTemplate":promptTemplate,
+            "systemInstructions":systemInstructions
         }
 
         self.threadLlumoRun = _ctxLlumoRun.set(llumoRun)
@@ -169,8 +172,15 @@ class LlumoSessionContext(LlumoClient):
 
         try:
             # print("[PAYLOAD]: ",run)
-            payload = run
+
+            payload = removeLLmStep(run)
+            # print("*******PAYLOAD AFTER removeLLmStep*******: ", payload)
+
+            payload = addSelectedTools(payload)
+            # print("********PAYLOAD AFTER addSelectedTools*********: ", payload)
+
             response = requests.post(url, headers=headers, json=payload, timeout=20)
+
             response.raise_for_status()
             # print("[PAYLOAD]: ",response.json())
 
@@ -293,7 +303,7 @@ class LlumoSessionContext(LlumoClient):
             "retrieverSource": retrieverSource,
             "topK": topK,
             "chunkSize":chunkSize,
-            "context": context,
+            "context": " ".join(context),
             "searchQuery": searchQuery,
             "latencyMs": latencyMs,
             "status": status,
@@ -318,6 +328,7 @@ class LlumoSessionContext(LlumoClient):
             "agentName": agentName,
             "numStepsTaken": numStepsTaken,
             "tools": tools,
+            "toolSelected":[],
             "query": query,
             "status": status,
         #     "message": message,

{llumo-0.2.38 → llumo-0.2.40/llumo.egg-info}/PKG-INFO

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