langtrace-python-sdk 2.2.28__tar.gz → 2.2.31__tar.gz

{langtrace_python_sdk-2.2.28 → langtrace_python_sdk-2.2.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: langtrace-python-sdk
-Version: 2.2.28
+Version: 2.2.31
 Summary: Python SDK for LangTrace
 Project-URL: Homepage, https://github.com/Scale3-Labs/langtrace-python-sdk
 Author-email: Scale3 Labs <engineering@scale3labs.com>
@@ -21,6 +21,7 @@ Requires-Dist: opentelemetry-sdk>=1.25.0
 Requires-Dist: sqlalchemy
 Requires-Dist: tiktoken>=0.1.1
 Requires-Dist: trace-attributes==7.0.4
+Requires-Dist: transformers>=4.11.3
 Provides-Extra: dev
 Requires-Dist: anthropic; extra == 'dev'
 Requires-Dist: chromadb; extra == 'dev'

{langtrace_python_sdk-2.2.28 → langtrace_python_sdk-2.2.31}/pyproject.toml

@@ -12,10 +12,10 @@ description = "Python SDK for LangTrace"
 readme = "README.md"
 authors = [{ name = "Scale3 Labs", email = "engineering@scale3labs.com" }]
 license = "Apache-2.0"
-classifiers=[
-    "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: Apache Software License",
-    "Operating System :: OS Independent",
+classifiers = [
+  "Programming Language :: Python :: 3",
+  "License :: OSI Approved :: Apache Software License",
+  "Operating System :: OS Independent",
 ]
 dependencies = [
   'trace-attributes==7.0.4',
@@ -28,40 +28,36 @@ dependencies = [
   'tiktoken>=0.1.1',
   'colorama>=0.4.6',
   'sqlalchemy',
-  'fsspec>=2024.6.0'
+  'fsspec>=2024.6.0',
+  "transformers>=4.11.3",
 ]
 
 requires-python = ">=3.9"
 
 [project.optional-dependencies]
 dev = [
-    "openai==1.30.1",
-    "anthropic",
-    "chromadb",
-    "qdrant-client",
-    "python-dotenv",
-    "pinecone-client",
-    "langchain",
-    "langchain-community",
-    "langchain-openai",
-    "langchain-openai",
-    "chromadb",
-    "cohere",
-    "qdrant_client",
-    "weaviate-client",
-    "ollama",
-    "groq",
-    "google-generativeai",
-    "google-cloud-aiplatform",
-    "mistralai"
-]
-
-test = [
-    "pytest",
-    "pytest-vcr",
-    "pytest-asyncio",
+  "openai==1.30.1",
+  "anthropic",
+  "chromadb",
+  "qdrant-client",
+  "python-dotenv",
+  "pinecone-client",
+  "langchain",
+  "langchain-community",
+  "langchain-openai",
+  "langchain-openai",
+  "chromadb",
+  "cohere",
+  "qdrant_client",
+  "weaviate-client",
+  "ollama",
+  "groq",
+  "google-generativeai",
+  "google-cloud-aiplatform",
+  "mistralai",
 ]
 
+test = ["pytest", "pytest-vcr", "pytest-asyncio"]
 
 
 [project.urls]
@@ -72,9 +68,7 @@ Homepage = "https://github.com/Scale3-Labs/langtrace-python-sdk"
 path = "src/langtrace_python_sdk/version.py"
 
 [tool.hatch.build.targets.sdist]
-include = [
-  "/src",
-]
+include = ["/src"]
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/langtrace_python_sdk", "src/examples", "src/tests"]

{langtrace_python_sdk-2.2.28 → langtrace_python_sdk-2.2.31}/src/examples/crewai_example/simple_agent/agents.py

@@ -28,5 +28,5 @@ class PoetryAgents:
             goal="""Create a poem that captures the essence of a given theme or emotion""",
             allow_delegation=False,
             verbose=True,
-            llm=self.ollama,
+            llm=self.open_ai,
         )

{langtrace_python_sdk-2.2.28 → langtrace_python_sdk-2.2.31}/src/examples/crewai_example/simple_agent/main.py

@@ -1,14 +1,11 @@
 from crewai import Crew
-from textwrap import dedent
 from .agents import PoetryAgents
 from .tasks import PoetryTasks
 from langtrace_python_sdk import langtrace
 from dotenv import load_dotenv
-import agentops
 
 load_dotenv()
-agentops.init()
-langtrace.init(write_spans_to_console=False, batch=False)
+langtrace.init()
 
 
 class PoetryCrew:
@@ -29,18 +26,11 @@ class PoetryCrew:
 
 
 # This is the main function that you will use to run your custom crew.
+# You can run this file using `python -m src.examples.crewai_example.simple_agent.main`
 if __name__ == "__main__":
     print("## Welcome to Poetry Crew")
     print("-------------------------------")
-    topic = input(
-        dedent(
-            """
-      What topic do you want to write a poem on?
-    """
-        )
-    )
-
-    poetry_crew = PoetryCrew(topic=topic)
+    poetry_crew = PoetryCrew(topic="cold")
     result = poetry_crew.run()
     print("\n\n########################")
     print("## Here is you poem")

{langtrace_python_sdk-2.2.28 → langtrace_python_sdk-2.2.31}/src/examples/crewai_example/simple_agent/tasks.py

@@ -18,4 +18,5 @@ class PoetryTasks:
             ),
             expected_output="A creative and expressive poem that captures the essence of the given topic.",
             agent=agent,
+            output_file="poem.txt",
         )

{langtrace_python_sdk-2.2.28 → langtrace_python_sdk-2.2.31}/src/examples/crewai_example/trip_planner/main.py

@@ -1,5 +1,4 @@
 from crewai import Crew
-from textwrap import dedent
 from .agents import TravelAgents
 from .tasks import TravelTasks
 from langtrace_python_sdk import langtrace
@@ -59,36 +58,8 @@ class TripCrew:
 if __name__ == "__main__":
     print("## Welcome to Trip Planner Crew")
     print("-------------------------------")
-    origin = input(
-        dedent(
-            """
-      From where will you be traveling from?
-    """
-        )
-    )
-    cities = input(
-        dedent(
-            """
-      What are the cities options you are interested in visiting?
-    """
-        )
-    )
-    date_range = input(
-        dedent(
-            """
-      What is the date range you are interested in traveling?
-    """
-        )
-    )
-    interests = input(
-        dedent(
-            """
-      What are some of your high level interests and hobbies?
-    """
-        )
-    )
 
-    trip_crew = TripCrew(origin, cities, date_range, interests)
+    trip_crew = TripCrew("cairo", "marsa alam", "sep", "scuba diving")
     result = trip_crew.run()
     print("\n\n########################")
     print("## Here is you Trip Plan")

{langtrace_python_sdk-2.2.28 → langtrace_python_sdk-2.2.31}/src/langtrace_python_sdk/extensions/langtrace_exporter.py

@@ -123,4 +123,4 @@ class LangTraceExporter(SpanExporter):
             return SpanExportResult.FAILURE
 
     def shutdown(self) -> None:
-        pass
+        print(Fore.WHITE + "⭐ Leave our github a star to stay on top of our updates - https://github.com/Scale3-Labs/langtrace" + Fore.RESET)

{langtrace_python_sdk-2.2.28 → langtrace_python_sdk-2.2.31}/src/langtrace_python_sdk/instrumentation/crewai/instrumentation.py

@@ -46,7 +46,7 @@ class CrewAIInstrumentation(BaseInstrumentor):
             )
             _W(
                 "crewai.task",
-                "Task.execute",
+                "Task.execute_sync",
                 patch_crew("Task.execute", version, tracer),
             )
         except Exception as e:

langtrace_python_sdk-2.2.31/src/langtrace_python_sdk/instrumentation/crewai/patch.py

@@ -0,0 +1,234 @@
+import json
+from importlib_metadata import version as v
+from langtrace_python_sdk.constants import LANGTRACE_SDK_NAME
+from langtrace_python_sdk.utils import set_span_attribute
+from langtrace_python_sdk.utils.llm import get_span_name, set_span_attributes
+from langtrace_python_sdk.constants.instrumentation.common import (
+    LANGTRACE_ADDITIONAL_SPAN_ATTRIBUTES_KEY,
+    SERVICE_PROVIDERS,
+)
+from opentelemetry import baggage
+from langtrace.trace_attributes import FrameworkSpanAttributes
+from opentelemetry.trace import SpanKind, Span, Tracer
+from opentelemetry.trace.status import Status, StatusCode
+
+
+crew_properties = {
+    "tasks": "object",
+    "agents": "object",
+    "cache": "bool",
+    "process": "object",
+    "verbose": "bool",
+    "memory": "bool",
+    "embedder": "json",
+    "full_output": "bool",
+    "manager_llm": "object",
+    "manager_agent": "object",
+    "manager_callbacks": "object",
+    "function_calling_llm": "object",
+    "config": "json",
+    "id": "object",
+    "max_rpm": "int",
+    "share_crew": "bool",
+    "step_callback": "object",
+    "task_callback": "object",
+    "prompt_file": "str",
+    "output_log_file": "bool",
+}
+
+task_properties = {
+    "id": "object",
+    "used_tools": "int",
+    "tools_errors": "int",
+    "delegations": "int",
+    "i18n": "object",
+    "thread": "object",
+    "prompt_context": "object",
+    "description": "str",
+    "expected_output": "str",
+    "config": "object",
+    "callback": "str",
+    "agent": "object",
+    "context": "object",
+    "async_execution": "bool",
+    "output_json": "object",
+    "output_pydantic": "object",
+    "output_file": "object",
+    "output": "object",
+    "tools": "object",
+    "human_input": "bool",
+}
+
+agent_properties = {
+    "formatting_errors": "int",
+    "id": "object",
+    "role": "str",
+    "goal": "str",
+    "backstory": "str",
+    "cache": "bool",
+    "config": "object",
+    "max_rpm": "int",
+    "verbose": "bool",
+    "allow_delegation": "bool",
+    "tools": "object",
+    "max_iter": "int",
+    "max_execution_time": "object",
+    "agent_executor": "object",
+    "tools_handler": "object",
+    "force_answer_max_iterations": "int",
+    "crew": "object",
+    "cache_handler": "object",
+    "step_callback": "object",
+    "i18n": "object",
+    "llm": "object",
+    "function_calling_llm": "object",
+    "callbacks": "object",
+    "system_template": "object",
+    "prompt_template": "object",
+    "response_template": "object",
+}
+
+
+def patch_crew(operation_name, version, tracer: Tracer):
+    def traced_method(wrapped, instance, args, kwargs):
+        service_provider = SERVICE_PROVIDERS["CREWAI"]
+        extra_attributes = baggage.get_baggage(LANGTRACE_ADDITIONAL_SPAN_ATTRIBUTES_KEY)
+        span_attributes = {
+            "langtrace.sdk.name": "langtrace-python-sdk",
+            "langtrace.service.name": service_provider,
+            "langtrace.service.type": "framework",
+            "langtrace.service.version": version,
+            "langtrace.version": v(LANGTRACE_SDK_NAME),
+            **(extra_attributes if extra_attributes is not None else {}),
+        }
+
+        attributes = FrameworkSpanAttributes(**span_attributes)
+
+        with tracer.start_as_current_span(
+            get_span_name(operation_name), kind=SpanKind.CLIENT
+        ) as span:
+
+            try:
+                set_span_attributes(span, attributes)
+                CrewAISpanAttributes(span=span, instance=instance)
+                result = wrapped(*args, **kwargs)
+                if result:
+                    span.set_status(Status(StatusCode.OK))
+
+                span.end()
+                return result
+
+            except Exception as err:
+                print("Error", err)
+                # Record the exception in the span
+                span.record_exception(err)
+
+                # Set the span status to indicate an error
+                span.set_status(Status(StatusCode.ERROR, str(err)))
+
+                # Reraise the exception to ensure it's not swallowed
+                raise
+
+    return traced_method
+
+
+class CrewAISpanAttributes:
+    span: Span
+    crew: dict
+
+    def __init__(self, span: Span, instance) -> None:
+        self.span = span
+        self.instance = instance
+        self.crew = {
+            "tasks": [],
+            "agents": [],
+        }
+
+        self.run()
+
+    def run(self):
+        instance_name = self.instance.__class__.__name__
+        if instance_name == "Crew":
+            self.set_crew_attributes()
+            set_span_attribute(self.span, "crewai.crew.config", json.dumps(self.crew))
+
+        elif instance_name == "Agent":
+            agent = self.set_agent_attributes()
+            # for key, value in agent.items():
+            #     set_span_attribute(self.span, key, value)
+            set_span_attribute(self.span, "crewai.agent.config", json.dumps(agent))
+        elif instance_name == "Task":
+            task = self.set_task_attributes()
+            # uncomment if you want to spread attributes for the UI instead of dumping the whole object
+            # for key, value in task.items():
+            #     set_span_attribute(self.span, key, value)
+            set_span_attribute(self.span, "crewai.task.config", json.dumps(task))
+
+    def set_crew_attributes(self):
+        for key, value in self.instance.__dict__.items():
+            if key == "tasks":
+                self._parse_tasks(value)
+
+            elif key == "agents":
+                self._parse_agents(value)
+            else:
+                self.crew[key] = str(value)
+
+    def set_agent_attributes(self):
+        agent = {}
+        for key, value in self.instance.__dict__.items():
+            if value is None:
+                continue
+            agent[key] = str(value)
+
+        return agent
+
+    def set_task_attributes(self):
+        task = {}
+        for key, value in self.instance.__dict__.items():
+            if value is None:
+                continue
+
+            if key == "agent":
+                task[key] = value.role
+            else:
+                task[key] = str(value)
+        return task
+
+    def _parse_agents(self, agents):
+        for agent in agents:
+            model = None
+            if agent.llm is not None:
+                if hasattr(agent.llm, "model"):
+                    model = agent.llm.model
+                elif hasattr(agent.llm, "model_name"):
+                    model = agent.llm.model_name
+            self.crew["agents"].append(
+                {
+                    "id": str(agent.id),
+                    "role": agent.role,
+                    "goal": agent.goal,
+                    "backstory": agent.backstory,
+                    "cache": agent.cache,
+                    "config": agent.config,
+                    "verbose": agent.verbose,
+                    "allow_delegation": agent.allow_delegation,
+                    "tools": agent.tools,
+                    "max_iter": agent.max_iter,
+                    "llm": str(model if model is not None else ""),
+                }
+            )
+
+    def _parse_tasks(self, tasks):
+        for task in tasks:
+            self.crew["tasks"].append(
+                {
+                    "agent": task.agent.role,
+                    "description": task.description,
+                    "async_execution": task.async_execution,
+                    "expected_output": task.expected_output,
+                    "human_input": task.human_input,
+                    "tools": task.tools,
+                    "output_file": task.output_file,
+                }
+            )

{langtrace_python_sdk-2.2.28 → langtrace_python_sdk-2.2.31}/src/langtrace_python_sdk/instrumentation/langchain_community/patch.py

@@ -23,6 +23,7 @@ from opentelemetry.trace.propagation import set_span_in_context
 
 from opentelemetry.trace import SpanKind
 from opentelemetry.trace.status import Status, StatusCode
+from langtrace.trace_attributes import SpanAttributes
 
 from langtrace_python_sdk.constants.instrumentation.common import (
     LANGTRACE_ADDITIONAL_SPAN_ATTRIBUTES_KEY,
@@ -71,6 +72,16 @@ def generic_patch(
                 if trace_output:
                     span.set_attribute("langchain.outputs", to_json_string(result))
 
+                    prompt_tokens = instance.get_num_tokens(args[0])
+                    completion_tokens = instance.get_num_tokens(result)
+                    if hasattr(result, 'usage'):
+                        prompt_tokens = result.usage.prompt_tokens
+                        completion_tokens = result.usage.completion_tokens
+
+                    span.set_attribute(SpanAttributes.LLM_USAGE_COMPLETION_TOKENS, prompt_tokens)
+                    span.set_attribute(SpanAttributes.LLM_USAGE_PROMPT_TOKENS, completion_tokens)
+
+
                 span.set_status(StatusCode.OK)
                 return result
             except Exception as err:

{langtrace_python_sdk-2.2.28 → langtrace_python_sdk-2.2.31}/src/langtrace_python_sdk/instrumentation/langchain_core/patch.py

@@ -30,6 +30,7 @@ from langtrace_python_sdk.constants.instrumentation.common import (
 from importlib_metadata import version as v
 
 from langtrace_python_sdk.constants import LANGTRACE_SDK_NAME
+from langtrace.trace_attributes import SpanAttributes
 
 
 def generic_patch(
@@ -78,8 +79,22 @@ def generic_patch(
             try:
                 # Attempt to call the original method
                 result = wrapped(*args, **kwargs)
+
                 if trace_output:
                     span.set_attribute("langchain.outputs", to_json_string(result))
+                    if hasattr(result, 'usage'):
+                        prompt_tokens = result.usage.prompt_tokens
+                        completion_tokens = result.usage.completion_tokens
+                        span.set_attribute(SpanAttributes.LLM_USAGE_PROMPT_TOKENS, prompt_tokens)
+                        span.set_attribute(SpanAttributes.LLM_USAGE_COMPLETION_TOKENS, completion_tokens)
+
+                    elif result.generations[0][0].text:
+                        span.set_attribute(SpanAttributes.LLM_USAGE_COMPLETION_TOKENS, instance.get_num_tokens(result.generations[0][0].text))
+                    elif isinstance(args[0][0], str):
+                        span.set_attribute(SpanAttributes.LLM_USAGE_PROMPT_TOKENS, instance.get_num_tokens(args[0][0]))
+
+                    else:
+                        span.set_attribute(SpanAttributes.LLM_USAGE_PROMPT_TOKENS, instance.get_num_tokens(args[0][0].text))
 
                 span.set_status(StatusCode.OK)
                 return result
@@ -156,6 +171,7 @@ def runnable_patch(
             try:
                 # Attempt to call the original method
                 result = wrapped(*args, **kwargs)
+
                 if trace_output:
                     outputs = {}
                     if isinstance(result, dict):

{langtrace_python_sdk-2.2.28 → langtrace_python_sdk-2.2.31}/src/langtrace_python_sdk/instrumentation/openai/patch.py

@@ -44,7 +44,7 @@ from langtrace_python_sdk.utils.llm import (
     StreamWrapper,
     set_span_attributes,
 )
-from openai._types import NOT_GIVEN
+from langtrace_python_sdk.types import NOT_GIVEN
 
 
 def images_generate(original_method, version, tracer):

{langtrace_python_sdk-2.2.28 → langtrace_python_sdk-2.2.31}/src/langtrace_python_sdk/langtrace.py

@@ -83,6 +83,7 @@ def init(
     )
     check_if_sdk_is_outdated()
     print(Fore.GREEN + "Initializing Langtrace SDK.." + Fore.RESET)
+    print(Fore.WHITE + "⭐ Leave our github a star to stay on top of our updates - https://github.com/Scale3-Labs/langtrace" + Fore.RESET)
     sampler = LangtraceSampler(disabled_methods=disable_tracing_for_functions)
     resource = Resource.create(
         attributes={

{langtrace_python_sdk-2.2.28 → langtrace_python_sdk-2.2.31}/src/langtrace_python_sdk/types/__init__.py

@@ -1,4 +1,4 @@
-from typing import List, Literal, TypedDict
+from typing import List, Literal, TypeVar, TypedDict, Union
 from enum import Enum
 
 
@@ -111,3 +111,32 @@ class InstrumentationMethods(TypedDict):
     anthropic: List[VendorMethods.AnthropicMethods]
     cohere: List[VendorMethods.CohereMethods]
     weaviate: List[str]
+
+_T = TypeVar("_T")
+class NotGiven:
+    """
+    A sentinel singleton class used to distinguish omitted keyword arguments
+    from those passed in with the value None (which may have different behavior).
+
+    For example:
+
+    ```py
+    def get(timeout: Union[int, NotGiven, None] = NotGiven()) -> Response:
+        ...
+
+
+    get(timeout=1)  # 1s timeout
+    get(timeout=None)  # No timeout
+    get()  # Default timeout behavior, which may not be statically known at the method definition.
+    ```
+    """
+
+    def __bool__(self) -> Literal[False]:
+        return False
+
+    def __repr__(self) -> str:
+        return "NOT_GIVEN"
+
+
+NotGivenOr = Union[_T, NotGiven]
+NOT_GIVEN = NotGiven()

{langtrace_python_sdk-2.2.28 → langtrace_python_sdk-2.2.31}/src/langtrace_python_sdk/utils/__init__.py

@@ -1,4 +1,4 @@
-from openai import NOT_GIVEN
+from langtrace_python_sdk.types import NOT_GIVEN
 from .sdk_version_checker import SDKVersionChecker
 from opentelemetry.trace import Span
 from langtrace.trace_attributes import SpanAttributes

{langtrace_python_sdk-2.2.28 → langtrace_python_sdk-2.2.31}/src/langtrace_python_sdk/utils/llm.py

@@ -16,7 +16,7 @@ limitations under the License.
 
 from langtrace_python_sdk.constants import LANGTRACE_SDK_NAME
 from langtrace_python_sdk.utils import set_span_attribute
-from openai import NOT_GIVEN
+from langtrace_python_sdk.types import NOT_GIVEN
 from tiktoken import get_encoding
 from tiktoken import get_encoding, list_encoding_names
 

langtrace_python_sdk-2.2.31/src/langtrace_python_sdk/version.py

@@ -0,0 +1 @@
+__version__ = "2.2.31"