mbxai 0.6.13__tar.gz → 0.6.15__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {mbxai-0.6.13 → mbxai-0.6.15}/PKG-INFO +1 -1
- {mbxai-0.6.13 → mbxai-0.6.15}/pyproject.toml +1 -1
- {mbxai-0.6.13 → mbxai-0.6.15}/setup.py +1 -1
- {mbxai-0.6.13 → mbxai-0.6.15}/src/mbxai/openrouter/client.py +0 -3
- {mbxai-0.6.13 → mbxai-0.6.15}/src/mbxai/tools/client.py +0 -7
- mbxai-0.6.15/src/mbxai/tools/types.py +74 -0
- {mbxai-0.6.13 → mbxai-0.6.15}/uv.lock +7 -7
- mbxai-0.6.13/src/mbxai/tools/types.py +0 -30
- {mbxai-0.6.13 → mbxai-0.6.15}/.gitignore +0 -0
- {mbxai-0.6.13 → mbxai-0.6.15}/LICENSE +0 -0
- {mbxai-0.6.13 → mbxai-0.6.15}/README.md +0 -0
- {mbxai-0.6.13 → mbxai-0.6.15}/src/mbxai/__init__.py +0 -0
- {mbxai-0.6.13 → mbxai-0.6.15}/src/mbxai/core.py +0 -0
- {mbxai-0.6.13 → mbxai-0.6.15}/src/mbxai/mcp/__init__.py +0 -0
- {mbxai-0.6.13 → mbxai-0.6.15}/src/mbxai/mcp/client.py +0 -0
- {mbxai-0.6.13 → mbxai-0.6.15}/src/mbxai/mcp/example.py +0 -0
- {mbxai-0.6.13 → mbxai-0.6.15}/src/mbxai/mcp/server.py +0 -0
- {mbxai-0.6.13 → mbxai-0.6.15}/src/mbxai/openrouter/__init__.py +0 -0
- {mbxai-0.6.13 → mbxai-0.6.15}/src/mbxai/openrouter/config.py +0 -0
- {mbxai-0.6.13 → mbxai-0.6.15}/src/mbxai/openrouter/models.py +0 -0
- {mbxai-0.6.13 → mbxai-0.6.15}/src/mbxai/tools/__init__.py +0 -0
- {mbxai-0.6.13 → mbxai-0.6.15}/src/mbxai/tools/example.py +0 -0
- {mbxai-0.6.13 → mbxai-0.6.15}/tests/test_core.py +0 -0
- {mbxai-0.6.13 → mbxai-0.6.15}/tests/test_mcp.py +0 -0
- {mbxai-0.6.13 → mbxai-0.6.15}/tests/test_openrouter.py +0 -0
- {mbxai-0.6.13 → mbxai-0.6.15}/tests/test_tools.py +0 -0
@@ -245,7 +245,6 @@ class OpenRouterClient:
|
|
245
245
|
response_format: type[BaseModel],
|
246
246
|
*,
|
247
247
|
model: Optional[Union[str, OpenRouterModel]] = None,
|
248
|
-
stream: bool = False,
|
249
248
|
**kwargs: Any,
|
250
249
|
) -> Any:
|
251
250
|
"""Create a chat completion and parse the response.
|
@@ -254,7 +253,6 @@ class OpenRouterClient:
|
|
254
253
|
messages: list of messages
|
255
254
|
response_format: Pydantic model to parse the response into
|
256
255
|
model: Optional model override
|
257
|
-
stream: Whether to stream the response
|
258
256
|
**kwargs: Additional parameters
|
259
257
|
|
260
258
|
Returns:
|
@@ -279,7 +277,6 @@ class OpenRouterClient:
|
|
279
277
|
messages=messages,
|
280
278
|
model=model or self.model,
|
281
279
|
response_format=response_format,
|
282
|
-
stream=stream,
|
283
280
|
**kwargs,
|
284
281
|
)
|
285
282
|
|
@@ -312,7 +312,6 @@ class ToolClient:
|
|
312
312
|
response_format: type[T],
|
313
313
|
*,
|
314
314
|
model: str | None = None,
|
315
|
-
stream: bool = False,
|
316
315
|
**kwargs: Any,
|
317
316
|
) -> Any:
|
318
317
|
"""Chat with the model and parse the response into a Pydantic model.
|
@@ -321,13 +320,11 @@ class ToolClient:
|
|
321
320
|
messages: The conversation messages
|
322
321
|
response_format: The Pydantic model to parse the response into
|
323
322
|
model: Optional model override
|
324
|
-
stream: Whether to stream the response
|
325
323
|
**kwargs: Additional parameters for the chat completion
|
326
324
|
|
327
325
|
Returns:
|
328
326
|
The parsed response from the model
|
329
327
|
"""
|
330
|
-
# First, use chat to handle any tool calls
|
331
328
|
tools = [tool.to_openai_function() for tool in self._tools.values()]
|
332
329
|
|
333
330
|
if tools:
|
@@ -341,13 +338,9 @@ class ToolClient:
|
|
341
338
|
messages=messages,
|
342
339
|
response_format=response_format,
|
343
340
|
model=model,
|
344
|
-
stream=stream,
|
345
341
|
**kwargs,
|
346
342
|
)
|
347
343
|
|
348
|
-
if stream:
|
349
|
-
return response
|
350
|
-
|
351
344
|
message = response.choices[0].message
|
352
345
|
# Add the assistant's message with tool calls
|
353
346
|
assistant_message = {
|
@@ -0,0 +1,74 @@
|
|
1
|
+
"""
|
2
|
+
Type definitions for the tools package.
|
3
|
+
"""
|
4
|
+
|
5
|
+
from typing import Any, Callable
|
6
|
+
from pydantic import BaseModel, Field
|
7
|
+
|
8
|
+
class ToolCall(BaseModel):
|
9
|
+
"""A tool call from the model."""
|
10
|
+
id: str
|
11
|
+
name: str
|
12
|
+
arguments: dict[str, Any]
|
13
|
+
|
14
|
+
class Tool(BaseModel):
|
15
|
+
"""A tool that can be used by the model."""
|
16
|
+
name: str
|
17
|
+
description: str
|
18
|
+
function: Callable[..., Any]
|
19
|
+
schema: dict[str, Any]
|
20
|
+
|
21
|
+
def to_openai_function(self) -> dict[str, Any]:
|
22
|
+
"""Convert the tool to an OpenAI function definition."""
|
23
|
+
# Ensure schema is in strict format
|
24
|
+
strict_schema = self._ensure_strict_schema(self.schema)
|
25
|
+
|
26
|
+
return {
|
27
|
+
"type": "function",
|
28
|
+
"function": {
|
29
|
+
"name": self.name,
|
30
|
+
"description": self.description,
|
31
|
+
"parameters": strict_schema
|
32
|
+
}
|
33
|
+
}
|
34
|
+
|
35
|
+
def _ensure_strict_schema(self, schema: dict[str, Any]) -> dict[str, Any]:
|
36
|
+
"""Ensure the schema is in strict format required by OpenAI.
|
37
|
+
|
38
|
+
Args:
|
39
|
+
schema: The input schema to validate and convert
|
40
|
+
|
41
|
+
Returns:
|
42
|
+
A schema in strict format
|
43
|
+
"""
|
44
|
+
# If schema has a $ref, resolve it
|
45
|
+
if "$ref" in schema:
|
46
|
+
ref = schema["$ref"].split("/")[-1]
|
47
|
+
schema = schema.get("$defs", {}).get(ref, {})
|
48
|
+
|
49
|
+
# If schema has an input wrapper, unwrap it
|
50
|
+
if "properties" in schema and "input" in schema["properties"]:
|
51
|
+
input_schema = schema["properties"]["input"]
|
52
|
+
if "$ref" in input_schema:
|
53
|
+
ref = input_schema["$ref"].split("/")[-1]
|
54
|
+
input_schema = schema.get("$defs", {}).get(ref, {})
|
55
|
+
schema = input_schema
|
56
|
+
|
57
|
+
# Ensure required fields are present
|
58
|
+
if "type" not in schema:
|
59
|
+
schema["type"] = "object"
|
60
|
+
|
61
|
+
if "properties" not in schema:
|
62
|
+
schema["properties"] = {}
|
63
|
+
|
64
|
+
if "required" not in schema:
|
65
|
+
schema["required"] = []
|
66
|
+
|
67
|
+
# Ensure all properties have type and description
|
68
|
+
for prop_name, prop in schema["properties"].items():
|
69
|
+
if "type" not in prop:
|
70
|
+
prop["type"] = "string" # Default to string if type not specified
|
71
|
+
if "description" not in prop:
|
72
|
+
prop["description"] = f"The {prop_name} parameter"
|
73
|
+
|
74
|
+
return schema
|
@@ -292,11 +292,11 @@ wheels = [
|
|
292
292
|
|
293
293
|
[[package]]
|
294
294
|
name = "httpx-sse"
|
295
|
-
version = "0.6.
|
295
|
+
version = "0.6.15"
|
296
296
|
source = { registry = "https://pypi.org/simple" }
|
297
|
-
sdist = { url = "https://files.pythonhosted.org/packages/4c/60/8f4281fa9bbf3c8034fd54c0e7412e66edbab6bc74c4996bd616f8d0406e/httpx-sse-0.6.
|
297
|
+
sdist = { url = "https://files.pythonhosted.org/packages/4c/60/8f4281fa9bbf3c8034fd54c0e7412e66edbab6bc74c4996bd616f8d0406e/httpx-sse-0.6.15.tar.gz", hash = "sha256:1e81a3a3070ce322add1d3529ed42eb5f70817f45ed6ec915ab753f961139721", size = 12624 }
|
298
298
|
wheels = [
|
299
|
-
{ url = "https://files.pythonhosted.org/packages/e1/9b/a181f281f65d776426002f330c31849b86b31fc9d848db62e16f03ff739f/httpx_sse-0.6.
|
299
|
+
{ url = "https://files.pythonhosted.org/packages/e1/9b/a181f281f65d776426002f330c31849b86b31fc9d848db62e16f03ff739f/httpx_sse-0.6.15-py3-none-any.whl", hash = "sha256:f329af6eae57eaa2bdfd962b42524764af68075ea87370a2de920af5341e318f", size = 7819 },
|
300
300
|
]
|
301
301
|
|
302
302
|
[[package]]
|
@@ -446,7 +446,7 @@ wheels = [
|
|
446
446
|
|
447
447
|
[[package]]
|
448
448
|
name = "mbxai"
|
449
|
-
version = "0.6.
|
449
|
+
version = "0.6.15"
|
450
450
|
source = { editable = "." }
|
451
451
|
dependencies = [
|
452
452
|
{ name = "fastapi" },
|
@@ -980,14 +980,14 @@ wheels = [
|
|
980
980
|
|
981
981
|
[[package]]
|
982
982
|
name = "typing-inspection"
|
983
|
-
version = "0.6.
|
983
|
+
version = "0.6.15"
|
984
984
|
source = { registry = "https://pypi.org/simple" }
|
985
985
|
dependencies = [
|
986
986
|
{ name = "typing-extensions" },
|
987
987
|
]
|
988
|
-
sdist = { url = "https://files.pythonhosted.org/packages/82/5c/e6082df02e215b846b4b8c0b887a64d7d08ffaba30605502639d44c06b82/typing_inspection-0.6.
|
988
|
+
sdist = { url = "https://files.pythonhosted.org/packages/82/5c/e6082df02e215b846b4b8c0b887a64d7d08ffaba30605502639d44c06b82/typing_inspection-0.6.15.tar.gz", hash = "sha256:9765c87de36671694a67904bf2c96e395be9c6439bb6c87b5142569dcdd65122", size = 76222 }
|
989
989
|
wheels = [
|
990
|
-
{ url = "https://files.pythonhosted.org/packages/31/08/aa4fdfb71f7de5176385bd9e90852eaf6b5d622735020ad600f2bab54385/typing_inspection-0.6.
|
990
|
+
{ url = "https://files.pythonhosted.org/packages/31/08/aa4fdfb71f7de5176385bd9e90852eaf6b5d622735020ad600f2bab54385/typing_inspection-0.6.15-py3-none-any.whl", hash = "sha256:50e72559fcd2a6367a19f7a7e610e6afcb9fac940c650290eed893d61386832f", size = 14125 },
|
991
991
|
]
|
992
992
|
|
993
993
|
[[package]]
|
@@ -1,30 +0,0 @@
|
|
1
|
-
"""
|
2
|
-
Type definitions for the tools package.
|
3
|
-
"""
|
4
|
-
|
5
|
-
from typing import Any, Callable
|
6
|
-
from pydantic import BaseModel
|
7
|
-
|
8
|
-
class ToolCall(BaseModel):
|
9
|
-
"""A tool call from the model."""
|
10
|
-
id: str
|
11
|
-
name: str
|
12
|
-
arguments: dict[str, Any]
|
13
|
-
|
14
|
-
class Tool(BaseModel):
|
15
|
-
"""A tool that can be used by the model."""
|
16
|
-
name: str
|
17
|
-
description: str
|
18
|
-
function: Callable[..., Any]
|
19
|
-
schema: dict[str, Any]
|
20
|
-
|
21
|
-
def to_openai_function(self) -> dict[str, Any]:
|
22
|
-
"""Convert the tool to an OpenAI function definition."""
|
23
|
-
return {
|
24
|
-
"type": "function",
|
25
|
-
"function": {
|
26
|
-
"name": self.name,
|
27
|
-
"description": self.description,
|
28
|
-
"parameters": self.schema
|
29
|
-
}
|
30
|
-
}
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|