ommlds 0.0.0.dev348__tar.gz → 0.0.0.dev349__tar.gz

{ommlds-0.0.0.dev348/ommlds.egg-info → ommlds-0.0.0.dev349}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev348
+Version: 0.0.0.dev349
 Summary: ommlds
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev348
-Requires-Dist: omlish==0.0.0.dev348
+Requires-Dist: omdev==0.0.0.dev349
+Requires-Dist: omlish==0.0.0.dev349
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.26; extra == "all"

{ommlds-0.0.0.dev348 → ommlds-0.0.0.dev349}/ommlds/.manifests.json

@@ -18,7 +18,7 @@
     "module": ".minichain.backends.anthropic.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/anthropic/chat.py",
-    "line": 30,
+    "line": 31,
     "value": {
       "$.minichain.registry.RegistryManifest": {
         "mod_name": "ommlds.minichain.backends.anthropic.chat",

{ommlds-0.0.0.dev348 → ommlds-0.0.0.dev349}/ommlds/minichain/backends/anthropic/chat.py

@@ -22,6 +22,7 @@ from ...chat.messages import Message
 from ...chat.messages import SystemMessage
 from ...chat.messages import UserMessage
 from ...standard import ApiKey
+from ...standard import ModelName
 
 
 ##
@@ -31,8 +32,11 @@ from ...standard import ApiKey
 @static_check_is_chat_choices_service
 class AnthropicChatChoicesService:
     model: ta.ClassVar[str] = (
-        'claude-3-5-sonnet-20241022'
-        # 'claude-3-opus-20240229'
+        # 'claude-opus-4-0'
+        # 'claude-sonnet-4-0'
+        # 'claude-3-7-sonnet-latest'
+        # 'claude-3-5-sonnet-latest'
+        'claude-3-5-haiku-latest'
     )
 
     ROLES_MAP: ta.ClassVar[ta.Mapping[type[Message], str]] = {
@@ -43,12 +47,13 @@ class AnthropicChatChoicesService:
 
     def __init__(
             self,
-            *configs: ApiKey,
+            *configs: ApiKey | ModelName,
     ) -> None:
         super().__init__()
 
         with tv.consume(*configs) as cc:
             self._api_key = check.not_none(ApiKey.pop_secret(cc, env='ANTHROPIC_API_KEY'))
+            self._model_name = cc.pop(ModelName(self.model))
 
     def _get_msg_content(self, m: Message) -> str | None:
         if isinstance(m, (SystemMessage, AiMessage)):

{ommlds-0.0.0.dev348 → ommlds-0.0.0.dev349}/ommlds/minichain/standard.py

@@ -62,10 +62,12 @@ class SecretConfig(Config, lang.Abstract):
         check.issubclass(cls, tv.UniqueTypedValue)
 
         if (ak := consumer.pop(cls, None)) is not None:  # type: ignore[type-var]
-            if isinstance(ak.v, str):
-                return sec.Secret.of(ak.v)
+            if isinstance(ak.v, sec.Secret):
+                return ak.v
             elif isinstance(ak.v, sec.SecretRef):
                 raise NotImplementedError
+            elif isinstance(ak.v, str):
+                return sec.Secret.of(ak.v)
             else:
                 raise TypeError(ak.v)
 

{ommlds-0.0.0.dev348 → ommlds-0.0.0.dev349/ommlds.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev348
+Version: 0.0.0.dev349
 Summary: ommlds
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev348
-Requires-Dist: omlish==0.0.0.dev348
+Requires-Dist: omdev==0.0.0.dev349
+Requires-Dist: omlish==0.0.0.dev349
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.26; extra == "all"

{ommlds-0.0.0.dev348 → ommlds-0.0.0.dev349}/ommlds.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev348
-omlish==0.0.0.dev348
+omdev==0.0.0.dev349
+omlish==0.0.0.dev349
 
 [all]
 llama-cpp-python~=0.3

{ommlds-0.0.0.dev348 → ommlds-0.0.0.dev349}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev348'
+version = '0.0.0.dev349'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ommlds'
 dependencies = [
-    'omdev == 0.0.0.dev348',
-    'omlish == 0.0.0.dev348',
+    'omdev == 0.0.0.dev349',
+    'omlish == 0.0.0.dev349',
 ]
 
 [project.optional-dependencies]