blaxel 0.2.0rc5__tar.gz → 0.2.0rc7__tar.gz

{blaxel-0.2.0rc5 → blaxel-0.2.0rc7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blaxel
-Version: 0.2.0rc5
+Version: 0.2.0rc7
 Summary: Blaxel - AI development platform SDK
 Project-URL: Homepage, https://blaxel.ai
 Project-URL: Documentation, https://docs.blaxel.ai

{blaxel-0.2.0rc5 → blaxel-0.2.0rc7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "blaxel"
-version = "0.2.0rc5"
+version = "0.2.0rc7"
 description = "Blaxel - AI development platform SDK"
 readme = "README.md"
 authors = [{ name = "cploujoux", email = "cploujoux@blaxel.ai" }]

{blaxel-0.2.0rc5 → blaxel-0.2.0rc7}/src/blaxel/telemetry/instrumentation/blaxel_core.py

@@ -10,9 +10,10 @@ from blaxel.telemetry.span import SpanManager
 
 logger = logging.getLogger(__name__)
 
+
 class BlaxelCoreInstrumentor(BaseInstrumentor):
     def instrumentation_dependencies(self):
-        return ["blaxel.core"]
+        return []
 
     def _instrument(self, **kwargs):
         tracer_provider = kwargs.get("tracer_provider")
@@ -121,4 +122,4 @@ class BlaxelCoreInstrumentor(BaseInstrumentor):
             Tool.sync_coroutine = traced_sync_coroutine
             return Tool
 
-        blaxel.core.tools.convert_mcp_tool_to_blaxel_tool = traced_convert_mcp_tool_to_blaxel_tool
+        blaxel.core.tools.convert_mcp_tool_to_blaxel_tool = traced_convert_mcp_tool_to_blaxel_tool

{blaxel-0.2.0rc5 → blaxel-0.2.0rc7}/src/blaxel/telemetry/instrumentation/blaxel_langgraph.py

@@ -8,9 +8,10 @@ from blaxel.telemetry.span import SpanManager
 
 logger = logging.getLogger(__name__)
 
+
 class BlaxelLanggraphInstrumentor(BaseInstrumentor):
     def instrumentation_dependencies(self):
-        return ["blaxel_langgraph", "blaxel.core"]
+        return ["langgraph"]
 
     def _instrument(self, **kwargs):
         tracer_provider = kwargs.get("tracer_provider")
@@ -22,21 +23,45 @@ class BlaxelLanggraphInstrumentor(BaseInstrumentor):
         import blaxel.langgraph.custom.gemini
 
         # Restore original methods
-        if hasattr(blaxel.langgraph.custom.gemini.GeminiRestClient, "_blaxel_original_generate_content"):
-            blaxel.langgraph.custom.gemini.GeminiRestClient.generate_content = blaxel.langgraph.custom.gemini.GeminiRestClient._blaxel_original_generate_content
-            delattr(blaxel.langgraph.custom.gemini.GeminiRestClient, "_blaxel_original_generate_content")
+        if hasattr(
+            blaxel.langgraph.custom.gemini.GeminiRestClient, "_blaxel_original_generate_content"
+        ):
+            blaxel.langgraph.custom.gemini.GeminiRestClient.generate_content = (
+                blaxel.langgraph.custom.gemini.GeminiRestClient._blaxel_original_generate_content
+            )
+            delattr(
+                blaxel.langgraph.custom.gemini.GeminiRestClient, "_blaxel_original_generate_content"
+            )
 
-        if hasattr(blaxel.langgraph.custom.gemini.GeminiRestClient, "_blaxel_original_generate_content_async"):
+        if hasattr(
+            blaxel.langgraph.custom.gemini.GeminiRestClient,
+            "_blaxel_original_generate_content_async",
+        ):
             blaxel.langgraph.custom.gemini.GeminiRestClient.generate_content_async = blaxel.langgraph.custom.gemini.GeminiRestClient._blaxel_original_generate_content_async
-            delattr(blaxel.langgraph.custom.gemini.GeminiRestClient, "_blaxel_original_generate_content_async")
+            delattr(
+                blaxel.langgraph.custom.gemini.GeminiRestClient,
+                "_blaxel_original_generate_content_async",
+            )
 
-        if hasattr(blaxel.langgraph.custom.gemini.GeminiRestClient, "_blaxel_original_stream_generate_content"):
+        if hasattr(
+            blaxel.langgraph.custom.gemini.GeminiRestClient,
+            "_blaxel_original_stream_generate_content",
+        ):
             blaxel.langgraph.custom.gemini.GeminiRestClient.stream_generate_content = blaxel.langgraph.custom.gemini.GeminiRestClient._blaxel_original_stream_generate_content
-            delattr(blaxel.langgraph.custom.gemini.GeminiRestClient, "_blaxel_original_stream_generate_content")
+            delattr(
+                blaxel.langgraph.custom.gemini.GeminiRestClient,
+                "_blaxel_original_stream_generate_content",
+            )
 
-        if hasattr(blaxel.langgraph.custom.gemini.GeminiRestClient, "_blaxel_original_stream_generate_content_async"):
+        if hasattr(
+            blaxel.langgraph.custom.gemini.GeminiRestClient,
+            "_blaxel_original_stream_generate_content_async",
+        ):
             blaxel.langgraph.custom.gemini.GeminiRestClient.stream_generate_content_async = blaxel.langgraph.custom.gemini.GeminiRestClient._blaxel_original_stream_generate_content_async
-            delattr(blaxel.langgraph.custom.gemini.GeminiRestClient, "_blaxel_original_stream_generate_content_async")
+            delattr(
+                blaxel.langgraph.custom.gemini.GeminiRestClient,
+                "_blaxel_original_stream_generate_content_async",
+            )
 
     def _patch_tool(self, tracer: Tracer):
         def _traced_run(original, instance, args, kwargs):
@@ -69,6 +94,6 @@ class BlaxelLanggraphInstrumentor(BaseInstrumentor):
                     span.set_attribute("tool.error", str(e))
                     raise
 
-        wrap_function_wrapper('langchain_core.tools', 'BaseTool.run', _traced_run)
-        wrap_function_wrapper('langchain_core.tools', 'BaseTool.arun', _traced_arun)
-        wrap_function_wrapper('langchain_core.tools', 'BaseTool.arun', _traced_arun)
+        wrap_function_wrapper("langchain_core.tools", "BaseTool.run", _traced_run)
+        wrap_function_wrapper("langchain_core.tools", "BaseTool.arun", _traced_arun)
+        wrap_function_wrapper("langchain_core.tools", "BaseTool.arun", _traced_arun)

{blaxel-0.2.0rc5 → blaxel-0.2.0rc7}/src/blaxel/telemetry/instrumentation/blaxel_langgraph_gemini.py

@@ -24,13 +24,13 @@ logger = logging.getLogger(__name__)
 
 WRAPPED_METHODS = [
     {
-        "package": "blaxel_langgraph.custom.gemini",
+        "package": "blaxel.langgraph.custom.gemini",
         "object": "GeminiRestClient",
         "method": "generate_content",
         "span_name": "gemini.generate_content",
     },
     {
-        "package": "blaxel_langgraph.custom.gemini",
+        "package": "blaxel.langgraph.custom.gemini",
         "object": "GeminiRestClient",
         "method": "generate_content_async",
         "span_name": "gemini.generate_content_async",
@@ -112,20 +112,14 @@ def _set_input_attributes(span, args, kwargs, llm_model):
         )
 
     _set_span_attribute(span, SpanAttributes.LLM_REQUEST_MODEL, llm_model)
-    _set_span_attribute(
-        span, SpanAttributes.LLM_REQUEST_TEMPERATURE, kwargs.get("temperature")
-    )
+    _set_span_attribute(span, SpanAttributes.LLM_REQUEST_TEMPERATURE, kwargs.get("temperature"))
     _set_span_attribute(
         span, SpanAttributes.LLM_REQUEST_MAX_TOKENS, kwargs.get("max_output_tokens")
     )
     _set_span_attribute(span, SpanAttributes.LLM_REQUEST_TOP_P, kwargs.get("top_p"))
     _set_span_attribute(span, SpanAttributes.LLM_TOP_K, kwargs.get("top_k"))
-    _set_span_attribute(
-        span, SpanAttributes.LLM_PRESENCE_PENALTY, kwargs.get("presence_penalty")
-    )
-    _set_span_attribute(
-        span, SpanAttributes.LLM_FREQUENCY_PENALTY, kwargs.get("frequency_penalty")
-    )
+    _set_span_attribute(span, SpanAttributes.LLM_PRESENCE_PENALTY, kwargs.get("presence_penalty"))
+    _set_span_attribute(span, SpanAttributes.LLM_FREQUENCY_PENALTY, kwargs.get("frequency_penalty"))
 
     return
 
@@ -157,12 +151,8 @@ def _set_response_attributes(span, response, llm_model):
                 _set_span_attribute(span, f"{prefix}.content", item.text)
                 _set_span_attribute(span, f"{prefix}.role", "assistant")
         elif isinstance(response.text, str):
-            _set_span_attribute(
-                span, f"{SpanAttributes.LLM_COMPLETIONS}.0.content", response.text
-            )
-            _set_span_attribute(
-                span, f"{SpanAttributes.LLM_COMPLETIONS}.0.role", "assistant"
-            )
+            _set_span_attribute(span, f"{SpanAttributes.LLM_COMPLETIONS}.0.content", response.text)
+            _set_span_attribute(span, f"{SpanAttributes.LLM_COMPLETIONS}.0.role", "assistant")
     else:
         if isinstance(response, list):
             for index, item in enumerate(response):
@@ -170,12 +160,8 @@ def _set_response_attributes(span, response, llm_model):
                 _set_span_attribute(span, f"{prefix}.content", item)
                 _set_span_attribute(span, f"{prefix}.role", "assistant")
         elif isinstance(response, str):
-            _set_span_attribute(
-                span, f"{SpanAttributes.LLM_COMPLETIONS}.0.content", response
-            )
-            _set_span_attribute(
-                span, f"{SpanAttributes.LLM_COMPLETIONS}.0.role", "assistant"
-            )
+            _set_span_attribute(span, f"{SpanAttributes.LLM_COMPLETIONS}.0.content", response)
+            _set_span_attribute(span, f"{SpanAttributes.LLM_COMPLETIONS}.0.role", "assistant")
 
     return
 
@@ -246,9 +232,9 @@ async def _awrap(tracer, to_wrap, wrapped, instance, args, kwargs):
     if hasattr(instance, "_model_id"):
         llm_model = instance._model_id.replace("models/", "")
     if hasattr(instance, "_model_name"):
-        llm_model = instance._model_name.replace(
-            "publishers/google/models/", ""
-        ).replace("models/", "")
+        llm_model = instance._model_name.replace("publishers/google/models/", "").replace(
+            "models/", ""
+        )
     if hasattr(instance, "model") and hasattr(instance.model, "model_name"):
         llm_model = instance.model.model_name.replace("models/", "")
 
@@ -290,9 +276,9 @@ def _wrap(tracer, to_wrap, wrapped, instance, args, kwargs):
     if hasattr(instance, "_model_id"):
         llm_model = instance._model_id.replace("models/", "")
     if hasattr(instance, "_model_name"):
-        llm_model = instance._model_name.replace(
-            "publishers/google/models/", ""
-        ).replace("models/", "")
+        llm_model = instance._model_name.replace("publishers/google/models/", "").replace(
+            "models/", ""
+        )
     if hasattr(instance, "model") and hasattr(instance.model, "model_name"):
         llm_model = instance.model.model_name.replace("models/", "")
 
@@ -330,7 +316,7 @@ class BlaxelLanggraphGeminiInstrumentor(BaseInstrumentor):
         Config.exception_logger = exception_logger
 
     def instrumentation_dependencies(self) -> Collection[str]:
-        return ["blaxel_langgraph"]
+        return ["langgraph"]
 
     def _instrument(self, **kwargs):
         tracer_provider = kwargs.get("tracer_provider")

{blaxel-0.2.0rc5 → blaxel-0.2.0rc7}/src/blaxel/telemetry/instrumentation/blaxel_llamaindex.py

@@ -30,7 +30,7 @@ TO_INSTRUMENT = [
 
 class BlaxelLlamaIndexInstrumentor(BaseInstrumentor):
     def instrumentation_dependencies(self):
-        return ["blaxel_llamaindex", "blaxel.core"]
+        return ["llama_index"]
 
     def _instrument(self, **kwargs):
         tracer_provider = kwargs.get("tracer_provider")
@@ -49,12 +49,8 @@ class BlaxelLlamaIndexInstrumentor(BaseInstrumentor):
         pass
 
     def _instrument_module(self, module_name, class_name, tracer):
-        wrap_function_wrapper(
-            module_name, f"{class_name}.call", query_wrapper(tracer)
-        )
-        wrap_function_wrapper(
-            module_name, f"{class_name}.acall", aquery_wrapper(tracer)
-        )
+        wrap_function_wrapper(module_name, f"{class_name}.call", query_wrapper(tracer))
+        wrap_function_wrapper(module_name, f"{class_name}.acall", aquery_wrapper(tracer))
 
 
 @_with_tracer_wrapper

{blaxel-0.2.0rc5 → blaxel-0.2.0rc7}/src/blaxel/telemetry/instrumentation/map.py

@@ -9,53 +9,54 @@ class InstrumentationMapping(BaseModel):
     required_packages: List[str]
     ignore_if_packages: List[str]
 
+
 MAPPINGS: Dict[str, InstrumentationMapping] = {
     "anthropic": InstrumentationMapping(
         module_path="opentelemetry.instrumentation.anthropic",
         class_name="AnthropicInstrumentor",
         required_packages=["anthropic"],
-        ignore_if_packages=[]
+        ignore_if_packages=[],
     ),
     "cohere": InstrumentationMapping(
         module_path="opentelemetry.instrumentation.cohere",
         class_name="CohereInstrumentor",
         required_packages=["cohere"],
-        ignore_if_packages=[]
+        ignore_if_packages=[],
     ),
     "openai": InstrumentationMapping(
         module_path="opentelemetry.instrumentation.openai",
         class_name="OpenAIInstrumentor",
         required_packages=["openai"],
-        ignore_if_packages=[]
+        ignore_if_packages=[],
     ),
     "gemini": InstrumentationMapping(
         module_path="opentelemetry.instrumentation.google_generativeai",
         class_name="GoogleGenerativeAIInstrumentor",
         required_packages=["google-generativeai"],
-        ignore_if_packages=[]
+        ignore_if_packages=[],
     ),
-    "blaxel.core": InstrumentationMapping(
-        module_path="blaxel_telemetry.instrumentation.blaxel.core",
+    "blaxel_core": InstrumentationMapping(
+        module_path="blaxel.telemetry.instrumentation.blaxel_core",
         class_name="BlaxelCoreInstrumentor",
-        required_packages=["blaxel.core"],
-        ignore_if_packages=[]
+        required_packages=[],
+        ignore_if_packages=[],
     ),
     "blaxel_langgraph": InstrumentationMapping(
-        module_path="blaxel_telemetry.instrumentation.blaxel_langgraph",
+        module_path="blaxel.telemetry.instrumentation.blaxel_langgraph",
         class_name="BlaxelLanggraphInstrumentor",
-        required_packages=["blaxel_langgraph"],
-        ignore_if_packages=[]
+        required_packages=["langgraph"],
+        ignore_if_packages=[],
     ),
     "blaxel_langgraph_gemini": InstrumentationMapping(
-        module_path="blaxel_telemetry.instrumentation.blaxel_langgraph_gemini",
+        module_path="blaxel.telemetry.instrumentation.blaxel_langgraph_gemini",
         class_name="BlaxelLanggraphGeminiInstrumentor",
-        required_packages=["blaxel_langgraph"],
-        ignore_if_packages=[]
+        required_packages=["langgraph"],
+        ignore_if_packages=[],
     ),
     "blaxel_llamaindex": InstrumentationMapping(
-        module_path="blaxel_telemetry.instrumentation.blaxel_llamaindex",
+        module_path="blaxel.telemetry.instrumentation.blaxel_llamaindex",
         class_name="BlaxelLlamaIndexInstrumentor",
-        required_packages=["blaxel_llamaindex"],
-        ignore_if_packages=[]
+        required_packages=["llama_index"],
+        ignore_if_packages=[],
     ),
 }