lightmodel 0.1.2__tar.gz → 0.1.4__tar.gz

{lightmodel-0.1.2/src/lightmodel.egg-info → lightmodel-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lightmodel
-Version: 0.1.2
+Version: 0.1.4
 Summary: Ultra-light Model adapter and web search tool for smolagents - works with any OpenAI-compatible API
 Author-email: PlimbAi <plimb.ai.contact@gmail.com>
 License: MIT

{lightmodel-0.1.2 → lightmodel-0.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "lightmodel"
-version = "0.1.2"
+version = "0.1.4"
 description = "Ultra-light Model adapter and web search tool for smolagents - works with any OpenAI-compatible API"
 readme = "README.md"
 requires-python = ">=3.9"

lightmodel-0.1.4/src/lightmodel/model.py

@@ -0,0 +1,126 @@
+"""LightModel - lightweight Model adapter for smolagents."""
+import json
+import requests
+
+from smolagents import Model
+
+try:
+    from smolagents.models import ChatMessage, MessageRole
+    ROLE_ASSISTANT = MessageRole.ASSISTANT
+except ImportError:
+    from smolagents.models import ChatMessage
+    ROLE_ASSISTANT = "assistant"
+
+
+class LightModel(Model):
+    """Universal adapter for any OpenAI-compatible API with tool calling."""
+
+    def __init__(self, model_id, api_base, api_key="not-needed",
+                 temperature=0.7, max_tokens=2048, timeout=120, extra=None):
+        super().__init__()
+        self.model_id = model_id
+        base = api_base.rstrip("/")
+        if not base.endswith("/chat/completions"):
+            base += "/chat/completions"
+        self.api_url = base
+        self.api_key = api_key
+        self.temperature = temperature
+        self.max_tokens = max_tokens
+        self.timeout = timeout
+        self.extra = extra or {}
+
+    def generate(self, messages, stop_sequences=None, response_format=None,
+                 tools_to_call_from=None, **kwargs):
+        headers = {"Content-Type": "application/json"}
+        if self.api_key:
+            headers["Authorization"] = f"Bearer {self.api_key}"
+
+        payload = {
+            "model": self.model_id,
+            "messages": self._to_openai(messages),
+            "temperature": self.temperature,
+            "max_tokens": self.max_tokens,
+            **self.extra,
+        }
+        if tools_to_call_from:
+            payload["tools"] = self._tools_to_openai(tools_to_call_from)
+            payload["tool_choice"] = "auto"
+        if stop_sequences:
+            payload["stop"] = stop_sequences
+
+        r = requests.post(self.api_url, json=payload, headers=headers,
+                          timeout=self.timeout)
+        if r.status_code >= 400:
+            raise RuntimeError(f"API {r.status_code}: {r.text[:300]}")
+
+        try:
+            msg = r.json()["choices"][0]["message"]
+        except (KeyError, IndexError):
+            raise RuntimeError(f"Invalid response: {r.text[:300]}")
+
+        content = msg.get("content") or ""
+        raw_calls = msg.get("tool_calls") or []
+        chat_msg = ChatMessage(role=ROLE_ASSISTANT, content=content)
+        if raw_calls:
+            chat_msg.tool_calls = [
+                {
+                    "id": tc.get("id", f"call_{i}"),
+                    "type": "function",
+                    "function": {
+                        "name": tc["function"]["name"],
+                        "arguments": tc["function"]["arguments"],
+                    },
+                }
+                for i, tc in enumerate(raw_calls)
+            ]
+        return chat_msg
+
+    @staticmethod
+    def _tools_to_openai(tools):
+        out = []
+        for t in tools:
+            props, required = {}, []
+            for name, spec in (t.inputs or {}).items():
+                props[name] = {
+                    "type": spec.get("type", "string"),
+                    "description": spec.get("description", ""),
+                }
+                required.append(name)
+            out.append({
+                "type": "function",
+                "function": {
+                    "name": t.name,
+                    "description": t.description,
+                    "parameters": {
+                        "type": "object",
+                        "properties": props,
+                        "required": required,
+                    },
+                },
+            })
+        return out
+
+    @staticmethod
+    def _to_openai(messages):
+        ROLE_MAP = {"tool-call": "assistant"}
+        out = []
+        for m in messages:
+            if isinstance(m, dict):
+                role, content = m.get("role", "user"), m.get("content", "")
+                tool_call_id = m.get("tool_call_id")
+            else:
+                role = getattr(m, "role", "user")
+                content = getattr(m, "content", "") or ""
+                tool_call_id = getattr(m, "tool_call_id", None)
+            if hasattr(role, "value"):
+                role = role.value
+            role = str(role)
+            if role in ("tool-response", "tool"):
+                msg = {"role": "tool", "content": str(content)}
+                if tool_call_id:
+                    msg["tool_call_id"] = tool_call_id
+                out.append(msg)
+                continue
+            role = ROLE_MAP.get(role, role)
+            out.append({"role": role, "content": str(content)})
+        return out

{lightmodel-0.1.2 → lightmodel-0.1.4/src/lightmodel.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lightmodel
-Version: 0.1.2
+Version: 0.1.4
 Summary: Ultra-light Model adapter and web search tool for smolagents - works with any OpenAI-compatible API
 Author-email: PlimbAi <plimb.ai.contact@gmail.com>
 License: MIT

lightmodel-0.1.2/src/lightmodel/model.py

@@ -1,75 +0,0 @@
-"""LightModel - lightweight Model adapter for smolagents."""
-import requests
-
-from smolagents import Model
-
-try:
-    from smolagents.models import ChatMessage, MessageRole
-    ROLE_ASSISTANT = MessageRole.ASSISTANT
-except ImportError:
-    from smolagents.models import ChatMessage
-    ROLE_ASSISTANT = "assistant"
-
-
-class LightModel(Model):
-    """Universal adapter for any OpenAI-compatible API."""
-
-    def __init__(self, model_id, api_base, api_key="not-needed",
-                 temperature=0.7, max_tokens=2048, timeout=120, extra=None):
-        super().__init__()
-        self.model_id = model_id
-        base = api_base.rstrip("/")
-        if not base.endswith("/chat/completions"):
-            base += "/chat/completions"
-        self.api_url = base
-        self.api_key = api_key
-        self.temperature = temperature
-        self.max_tokens = max_tokens
-        self.timeout = timeout
-        self.extra = extra or {}
-
-    def generate(self, messages, stop_sequences=None, response_format=None,
-                 tools_to_call_from=None, **kwargs):
-        headers = {"Content-Type": "application/json"}
-        if self.api_key:
-            headers["Authorization"] = f"Bearer {self.api_key}"
-
-        payload = {
-            "model": self.model_id,
-            "messages": self._to_openai(messages),
-            "temperature": self.temperature,
-            "max_tokens": self.max_tokens,
-            **self.extra,
-        }
-        if stop_sequences:
-            payload["stop"] = stop_sequences
-
-        r = requests.post(self.api_url, json=payload, headers=headers,
-                          timeout=self.timeout)
-        if r.status_code >= 400:
-            raise RuntimeError(f"API {r.status_code}: {r.text[:300]}")
-        try:
-            text = r.json()["choices"][0]["message"]["content"] or ""
-        except (KeyError, IndexError):
-            raise RuntimeError(f"Invalid response: {r.text[:300]}")
-        return ChatMessage(role=ROLE_ASSISTANT, content=text)
-
-    @staticmethod
-    def _to_openai(messages):
-        ROLE_MAP = {
-            "tool-call": "assistant",
-            "tool-response": "tool",
-            "tool": "tool",
-        }
-        out = []
-        for m in messages:
-            if isinstance(m, dict):
-                role, content = m.get("role", "user"), m.get("content", "")
-            else:
-                role = getattr(m, "role", "user")
-                content = getattr(m, "content", "")
-            if hasattr(role, "value"):
-                role = role.value
-            role = ROLE_MAP.get(str(role), str(role))
-            out.append({"role": role, "content": str(content)})
-        return out