janito 2.1.1__py3-none-any.whl → 2.3.0__py3-none-any.whl

janito/llm/auth.py

@@ -35,6 +35,7 @@ class LLMAuthManager:
         os.makedirs(os.path.dirname(self._auth_file), exist_ok=True)
         with open(self._auth_file, "w") as f:
             json.dump(self._credentials, f, indent=2)
+            f.write("\n")
 
     def set_credentials(self, provider_name: str, credentials: str) -> None:
         """

janito/llm/driver.py

@@ -122,11 +122,17 @@ class LLMDriver(ABC):
         if not self.available:
             self.handle_driver_unavailable(request_id)
             return
+        # Prepare payload for RequestStarted event
+        payload = {"provider_name": self.provider_name}
+        if hasattr(config, "model") and getattr(config, "model", None):
+            payload["model"] = getattr(config, "model")
+        elif hasattr(config, "model_name") and getattr(config, "model_name", None):
+            payload["model"] = getattr(config, "model_name")
         self.output_queue.put(
             RequestStarted(
                 driver_name=self.__class__.__name__,
                 request_id=request_id,
-                payload={"provider_name": self.provider_name},
+                payload=payload,
             )
         )
         # Check for cancel_event before starting

janito/llm/driver_config.py

@@ -23,6 +23,7 @@ class LLMDriverConfig:
     presence_penalty: Optional[float] = None
     frequency_penalty: Optional[float] = None
     stop: Optional[Any] = None  # list or string, depending on backend
+    reasoning_effort: Optional[str] = None
     extra: dict = field(
         default_factory=dict
     )  # for provider-specific miscellaneous config fields

janito/llm/driver_config_builder.py

@@ -1,34 +1,34 @@
-from typing import Type, Dict, Any
-from janito.llm.driver_config import LLMDriverConfig
-
-
-def build_llm_driver_config(
-    config: Dict[str, Any], driver_class: Type
-) -> LLMDriverConfig:
-    """
-    Build an LLMDriverConfig instance for the given driver class based on its declared driver_fields.
-    Only fills fields missing from given config; does not overwrite fields already provided.
-    Any config fields not in driver_fields or LLMDriverConfig fields go into .extra.
-    """
-    driver_fields = getattr(driver_class, "driver_fields", None)
-    if driver_fields is None:
-        driver_fields = set(LLMDriverConfig.__dataclass_fields__.keys()) - {
-            "model",
-            "extra",
-        }
-    base_info = {}
-    extra = {}
-    for k, v in (config or {}).items():
-        if k in driver_fields and k in LLMDriverConfig.__dataclass_fields__:
-            base_info[k] = v
-        else:
-            extra[k] = v
-    # Only set missing fields, do NOT overwrite those from CLI/user
-    for field in driver_fields:
-        if field not in base_info and field in LLMDriverConfig.__dataclass_fields__:
-            base_info[field] = (
-                None  # Optional: replace None with provider/driver default if wanted
-            )
-    return LLMDriverConfig(
-        model=config.get("model") or config.get("model_name"), extra=extra, **base_info
-    )
+from typing import Type, Dict, Any
+from janito.llm.driver_config import LLMDriverConfig
+
+
+def build_llm_driver_config(
+    config: Dict[str, Any], driver_class: Type
+) -> LLMDriverConfig:
+    """
+    Build an LLMDriverConfig instance for the given driver class based on its declared driver_fields.
+    Only fills fields missing from given config; does not overwrite fields already provided.
+    Any config fields not in driver_fields or LLMDriverConfig fields go into .extra.
+    """
+    driver_fields = getattr(driver_class, "driver_fields", None)
+    if driver_fields is None:
+        driver_fields = set(LLMDriverConfig.__dataclass_fields__.keys()) - {
+            "model",
+            "extra",
+        }
+    base_info = {}
+    extra = {}
+    for k, v in (config or {}).items():
+        if k in driver_fields and k in LLMDriverConfig.__dataclass_fields__:
+            base_info[k] = v
+        else:
+            extra[k] = v
+    # Only set missing fields, do NOT overwrite those from CLI/user
+    for field in driver_fields:
+        if field not in base_info and field in LLMDriverConfig.__dataclass_fields__:
+            base_info[field] = (
+                None  # Optional: replace None with provider/driver default if wanted
+            )
+    return LLMDriverConfig(
+        model=config.get("model") or config.get("model_name"), extra=extra, **base_info
+    )

janito/llm/driver_input.py

@@ -1,12 +1,12 @@
-from dataclasses import dataclass, field
-from typing import Optional
-import threading
-from janito.llm.driver_config import LLMDriverConfig
-from janito.conversation_history import LLMConversationHistory
-
-
-@dataclass
-class DriverInput:
-    config: LLMDriverConfig
-    conversation_history: LLMConversationHistory
-    cancel_event: Optional[threading.Event] = field(default=None)
+from dataclasses import dataclass, field
+from typing import Optional
+import threading
+from janito.llm.driver_config import LLMDriverConfig
+from janito.conversation_history import LLMConversationHistory
+
+
+@dataclass
+class DriverInput:
+    config: LLMDriverConfig
+    conversation_history: LLMConversationHistory
+    cancel_event: Optional[threading.Event] = field(default=None)

janito/llm/message_parts.py

@@ -1,60 +1,60 @@
-import attr
-
-
-class MessagePart:
-    """
-    Base class for all driver message parts.
-    """
-
-    type: str
-
-
-@attr.s(auto_attribs=True, kw_only=True)
-class TextMessagePart(MessagePart):
-    content: str = ""
-
-
-@attr.s(auto_attribs=True, kw_only=True)
-class InlineDataMessagePart(MessagePart):
-    content: bytes = b""
-
-
-@attr.s(auto_attribs=True, kw_only=True)
-class FileDataMessagePart(MessagePart):
-    content: str = ""
-
-
-@attr.s(auto_attribs=True, kw_only=True)
-class VideoMetadataMessagePart(MessagePart):
-    content: dict = attr.Factory(dict)
-
-
-@attr.s(auto_attribs=True, kw_only=True)
-class CodeExecutionResultMessagePart(MessagePart):
-    content: str = ""
-    stdout: str = ""
-    stderr: str = ""
-
-
-@attr.s(auto_attribs=True, kw_only=True)
-class ExecutableCodeMessagePart(MessagePart):
-    content: str = ""
-
-
-@attr.s(auto_attribs=True, kw_only=True)
-class FunctionCallMessagePart(MessagePart):
-    tool_call_id: str = ""
-    function: object = (
-        None  # Should match OpenAI SDK structure (with arguments as JSON string)
-    )
-
-
-@attr.s(auto_attribs=True, kw_only=True)
-class FunctionResponseMessagePart(MessagePart):
-    name: str = ""
-    content: dict = attr.Factory(dict)
-
-
-@attr.s(auto_attribs=True, kw_only=True)
-class ThoughtMessagePart(MessagePart):
-    content: bool = False
+import attr
+
+
+class MessagePart:
+    """
+    Base class for all driver message parts.
+    """
+
+    type: str
+
+
+@attr.s(auto_attribs=True, kw_only=True)
+class TextMessagePart(MessagePart):
+    content: str = ""
+
+
+@attr.s(auto_attribs=True, kw_only=True)
+class InlineDataMessagePart(MessagePart):
+    content: bytes = b""
+
+
+@attr.s(auto_attribs=True, kw_only=True)
+class FileDataMessagePart(MessagePart):
+    content: str = ""
+
+
+@attr.s(auto_attribs=True, kw_only=True)
+class VideoMetadataMessagePart(MessagePart):
+    content: dict = attr.Factory(dict)
+
+
+@attr.s(auto_attribs=True, kw_only=True)
+class CodeExecutionResultMessagePart(MessagePart):
+    content: str = ""
+    stdout: str = ""
+    stderr: str = ""
+
+
+@attr.s(auto_attribs=True, kw_only=True)
+class ExecutableCodeMessagePart(MessagePart):
+    content: str = ""
+
+
+@attr.s(auto_attribs=True, kw_only=True)
+class FunctionCallMessagePart(MessagePart):
+    tool_call_id: str = ""
+    function: object = (
+        None  # Should match OpenAI SDK structure (with arguments as JSON string)
+    )
+
+
+@attr.s(auto_attribs=True, kw_only=True)
+class FunctionResponseMessagePart(MessagePart):
+    name: str = ""
+    content: dict = attr.Factory(dict)
+
+
+@attr.s(auto_attribs=True, kw_only=True)
+class ThoughtMessagePart(MessagePart):
+    content: bool = False

janito/llm/model.py

@@ -1,38 +1,38 @@
-from dataclasses import dataclass, field
-from typing import Any, Optional
-
-
-@dataclass
-class LLMModelInfo:
-    name: str
-    context: Any = "N/A"
-    max_input: Any = "N/A"
-    max_cot: Any = "N/A"
-    max_response: Any = "N/A"
-    thinking_supported: Any = "N/A"
-    default_temp: float = 0.2
-    open: Optional[Any] = None
-    category: Optional[str] = None
-    driver: Optional[str] = None
-    # This enables arbitrary provider-specific metadata
-    other: dict = field(default_factory=dict)
-
-    def to_dict(self) -> dict:
-        d = self.__dict__.copy()
-        if not self.open:
-            d.pop("open")
-        if not self.category:
-            d.pop("category")
-        if not self.driver:
-            d.pop("driver")
-        if not self.other:
-            d.pop("other")
-        return d
-
-    @staticmethod
-    def get_model_info(model_specs):
-        """
-        Standard get_model_info implementation for all providers:
-        returns a list of model info dicts, one per model in the given MODEL_SPECS dict.
-        """
-        return [m.to_dict() for m in model_specs.values()]
+from dataclasses import dataclass, field
+from typing import Any, Optional
+
+
+@dataclass
+class LLMModelInfo:
+    name: str
+    context: Any = "N/A"
+    max_input: Any = "N/A"
+    max_cot: Any = "N/A"
+    max_response: Any = "N/A"
+    thinking_supported: Any = "N/A"
+    default_temp: float = 0.2
+    open: Optional[Any] = None
+    category: Optional[str] = None
+    driver: Optional[str] = None
+    # This enables arbitrary provider-specific metadata
+    other: dict = field(default_factory=dict)
+
+    def to_dict(self) -> dict:
+        d = self.__dict__.copy()
+        if not self.open:
+            d.pop("open")
+        if not self.category:
+            d.pop("category")
+        if not self.driver:
+            d.pop("driver")
+        if not self.other:
+            d.pop("other")
+        return d
+
+    @staticmethod
+    def get_model_info(model_specs):
+        """
+        Standard get_model_info implementation for all providers:
+        returns a list of model info dicts, one per model in the given MODEL_SPECS dict.
+        """
+        return [m.to_dict() for m in model_specs.values()]