blaxel 0.2.7rc80__py3-none-any.whl → 0.2.7rc82__py3-none-any.whl

blaxel/core/authentication/__init__.py

@@ -12,6 +12,7 @@ from .types import BlaxelAuth, CredentialsType
 
 logger = getLogger(__name__)
 
+
 def get_credentials() -> Optional[CredentialsType]:
     """
     Get credentials from environment variables or config file.
@@ -19,35 +20,34 @@ def get_credentials() -> Optional[CredentialsType]:
     Returns:
         Optional[CredentialsType]: The credentials or None if not found
     """
+
     def get_workspace():
         if os.environ.get("BL_WORKSPACE"):
             return os.environ.get("BL_WORKSPACE")
         home_dir = Path.home()
-        config_path = home_dir / '.blaxel' / 'config.yaml'
-        with open(config_path, encoding='utf-8') as f:
+        config_path = home_dir / ".blaxel" / "config.yaml"
+        with open(config_path, encoding="utf-8") as f:
             config_json = yaml.safe_load(f)
         return config_json.get("context", {}).get("workspace")
 
     if os.environ.get("BL_API_KEY"):
-        return CredentialsType(
-            api_key=os.environ.get("BL_API_KEY"),
-            workspace=get_workspace()
-        )
+        return CredentialsType(api_key=os.environ.get("BL_API_KEY"), workspace=get_workspace())
 
     if os.environ.get("BL_CLIENT_CREDENTIALS"):
         return CredentialsType(
-            client_credentials=os.environ.get("BL_CLIENT_CREDENTIALS"),
-            workspace=get_workspace()
+            client_credentials=os.environ.get("BL_CLIENT_CREDENTIALS"), workspace=get_workspace()
         )
 
     try:
         home_dir = Path.home()
-        config_path = home_dir / '.blaxel' / 'config.yaml'
+        config_path = home_dir / ".blaxel" / "config.yaml"
 
-        with open(config_path, encoding='utf-8') as f:
+        with open(config_path, encoding="utf-8") as f:
             config_json = yaml.safe_load(f)
 
-        workspace_name = os.environ.get("BL_WORKSPACE") or config_json.get("context", {}).get("workspace")
+        workspace_name = os.environ.get("BL_WORKSPACE") or config_json.get("context", {}).get(
+            "workspace"
+        )
 
         for workspace in config_json.get("workspaces", []):
             if workspace.get("name") == workspace_name:
@@ -55,12 +55,12 @@ def get_credentials() -> Optional[CredentialsType]:
                 credentials["workspace"] = workspace_name
                 return CredentialsType(
                     workspace=credentials["workspace"],
-                    api_key=credentials.get("api_key"),
-                    client_credentials=credentials.get("client_credentials"),
+                    api_key=credentials.get("apiKey"),
+                    client_credentials=credentials.get("clientCredentials"),
                     refresh_token=credentials.get("refresh_token"),
                     access_token=credentials.get("access_token"),
                     device_code=credentials.get("device_code"),
-                    expires_in=credentials.get("expires_in")
+                    expires_in=credentials.get("expires_in"),
                 )
 
         return None
@@ -94,4 +94,5 @@ def auth(env: str, base_url: str) -> BlaxelAuth:
 
     return BlaxelAuth(credentials, credentials.workspace, base_url)
 
-__all__ = ["BlaxelAuth", "CredentialsType"]
+
+__all__ = ["BlaxelAuth", "CredentialsType"]

blaxel/telemetry/instrumentation/blaxel_core.py

@@ -88,8 +88,8 @@ class BlaxelCoreInstrumentor(BaseInstrumentor):
         # Patch convert_mcp_tool_to_blaxel_tool to wrap tool calls
         orig_convert = blaxel.core.tools.convert_mcp_tool_to_blaxel_tool
 
-        def traced_convert_mcp_tool_to_blaxel_tool(websocket_client, name, url, tool):
-            Tool = orig_convert(websocket_client, name, url, tool)
+        def traced_convert_mcp_tool_to_blaxel_tool(websocket_client, tool):
+            Tool = orig_convert(websocket_client, tool)
             orig_coroutine = Tool.coroutine
             orig_sync_coroutine = Tool.sync_coroutine
 
@@ -97,8 +97,8 @@ class BlaxelCoreInstrumentor(BaseInstrumentor):
                 span_attributes = {
                     "tool.name": tool.name,
                     "tool.args": json.dumps(kwargs),
-                    "tool.server": url,
-                    "tool.server_name": name,
+                    "tool.server": websocket_client._url,
+                    "tool.server_name": websocket_client.name,
                     "span.type": "tool.call",
                     **SpanManager.get_default_attributes(),
                 }
@@ -110,8 +110,8 @@ class BlaxelCoreInstrumentor(BaseInstrumentor):
                 span_attributes = {
                     "tool.name": tool.name,
                     "tool.args": json.dumps(kwargs),
-                    "tool.server": url,
-                    "tool.server_name": name,
+                    "tool.server": websocket_client._url,
+                    "tool.server_name": websocket_client.name,
                     "span.type": "tool.call",
                     **SpanManager.get_default_attributes(),
                 }

{blaxel-0.2.7rc80.dist-info → blaxel-0.2.7rc82.dist-info}/METADATA

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

{blaxel-0.2.7rc80.dist-info → blaxel-0.2.7rc82.dist-info}/RECORD

@@ -2,7 +2,7 @@ blaxel/__init__.py,sha256=dK8RSbcDKSdr3Fr45aLDs6qPkLkxrsERQo24HCATbf4,241
 blaxel/core/__init__.py,sha256=OeRTi6S78PQiyrDMM8RjgLYbjXb3inTxW8Z6rrbg39w,1026
 blaxel/core/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 blaxel/core/agents/__init__.py,sha256=_mtes7ZRf2AXtGF4AWE13T0iHd0SMc0b03ypuX5k3TM,4088
-blaxel/core/authentication/__init__.py,sha256=tL9XKNCek5ixszTqjlKRBvidXMg4Nj6ODlBKlxxA9uk,3283
+blaxel/core/authentication/__init__.py,sha256=7gK_yLclpI0oiK4ZiGRyA6l5yXkcKrYMnVLYCulV598,3262
 blaxel/core/authentication/apikey.py,sha256=n_5IA2y3wS_218R8N1Ic82Okhq6C69g_Tg4Pt5YSDnA,1250
 blaxel/core/authentication/clientcredentials.py,sha256=esxSfGUacO8D_hn9nAx7wQ0oG8D0VsjfUzrPAeui8oM,3928
 blaxel/core/authentication/devicemode.py,sha256=nCo9-y194L2XDt5_9FOSK36Nc7l6Oxz1NKJQk6g2ses,6019
@@ -394,7 +394,7 @@ blaxel/telemetry/exporters.py,sha256=EoX3uaBVku1Rg49pSNXKFyHhgY5OV3Ih6UlqgjF5epw
 blaxel/telemetry/manager.py,sha256=3yYBxxqQKl1rCKrn0GVz9jR5jouC1nsElbAaH8tTtgA,9075
 blaxel/telemetry/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 blaxel/telemetry/span.py,sha256=b8lpWe5nqek4w9YrBLJCIYz4Z3n9Z_49H_AkqpAGOiM,3660
-blaxel/telemetry/instrumentation/blaxel_core.py,sha256=zQnWu8OBumbIO-GNLqdYGw6Tv-ol9Kkp4nrmZtA0fqk,4882
+blaxel/telemetry/instrumentation/blaxel_core.py,sha256=aPFI9RdOBrmqOpxIlMJaSZfrWtVGD14Iv5FsZ37vLsc,4930
 blaxel/telemetry/instrumentation/blaxel_langgraph.py,sha256=sBxt8kzRjsFepm86vaCBbGvpYI4mWPK_PB3wiLxSuOk,4235
 blaxel/telemetry/instrumentation/blaxel_langgraph_gemini.py,sha256=hQbOaaMsHte_Igq_vhPgNXYd40IwuqPB0TUP-5VAtME,11953
 blaxel/telemetry/instrumentation/blaxel_llamaindex.py,sha256=HA4YUXrRYvG5U1J8MAJnymmmj4ZCDydv-pXXhrftHOA,3101
@@ -402,7 +402,7 @@ blaxel/telemetry/instrumentation/map.py,sha256=PCzZJj39yiYVYJrxLBNP-NW-tjjYyTijw
 blaxel/telemetry/instrumentation/utils.py,sha256=KInMYZH-mu9_wvetmf0EmgrfN3Sw8IWk2Y95v2u90_U,1901
 blaxel/telemetry/log/log.py,sha256=RvQByRjZMoP_dRaAZu8oK6DTegsHs-xV4W-UIqis6CA,2461
 blaxel/telemetry/log/logger.py,sha256=NPAS3g82ryROjvc_DEZaTIfrcehoLEZoP-JkLxADxc0,4113
-blaxel-0.2.7rc80.dist-info/METADATA,sha256=Ev-gN6ZDdkd_qd7BRzmpRW_WsVeN7JmeOOsfSHtI5RM,9879
-blaxel-0.2.7rc80.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-blaxel-0.2.7rc80.dist-info/licenses/LICENSE,sha256=p5PNQvpvyDT_0aYBDgmV1fFI_vAD2aSV0wWG7VTgRis,1069
-blaxel-0.2.7rc80.dist-info/RECORD,,
+blaxel-0.2.7rc82.dist-info/METADATA,sha256=PZvVY1dTI91z_fmxB056Pn0fEAJd6yUYt5GE7EavU7k,9879
+blaxel-0.2.7rc82.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+blaxel-0.2.7rc82.dist-info/licenses/LICENSE,sha256=p5PNQvpvyDT_0aYBDgmV1fFI_vAD2aSV0wWG7VTgRis,1069
+blaxel-0.2.7rc82.dist-info/RECORD,,