PyPI - lm-deluge - Versions diffs - 0.0.57__py3-none-any.whl → 0.0.58__py3-none-any.whl - Mend

lm-deluge 0.0.57py3-none-any.whl → 0.0.58py3-none-any.whl

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.

Potentially problematic release.

This version of lm-deluge might be problematic. Click here for more details.

Files changed (18) hide show

lm_deluge/api_requests/anthropic.py +1 -1
lm_deluge/client.py +25 -9
lm_deluge/models/__init__.py +7 -7
lm_deluge/models/anthropic.py +12 -20
lm_deluge/models/bedrock.py +0 -14
lm_deluge/models/cohere.py +0 -16
lm_deluge/models/google.py +0 -20
lm_deluge/models/grok.py +48 -4
lm_deluge/models/groq.py +2 -2
lm_deluge/models/meta.py +0 -8
lm_deluge/models/openai.py +0 -34
lm_deluge/models/openrouter.py +64 -1
lm_deluge/models/together.py +0 -16
{lm_deluge-0.0.57.dist-info → lm_deluge-0.0.58.dist-info}/METADATA +1 -1
{lm_deluge-0.0.57.dist-info → lm_deluge-0.0.58.dist-info}/RECORD +18 -18
{lm_deluge-0.0.57.dist-info → lm_deluge-0.0.58.dist-info}/WHEEL +0 -0
{lm_deluge-0.0.57.dist-info → lm_deluge-0.0.58.dist-info}/licenses/LICENSE +0 -0
{lm_deluge-0.0.57.dist-info → lm_deluge-0.0.58.dist-info}/top_level.txt +0 -0

lm_deluge/api_requests/anthropic.py CHANGED Viewed

@@ -72,7 +72,7 @@ def _build_anthropic_request(
         request_json["system"] = system_message
     # handle temp + top_p for opus 4.1/sonnet 4.5
-    if model.name in ["claude-sonnet-4-5-20250929", "claude-opus-4-1-20250805"]:
+    if "4-1" in model.name or "4-5" in model.name:
         if "temperature" in request_json and "top_p" in request_json:
             request_json.pop("top_p")

lm_deluge/client.py CHANGED Viewed

@@ -369,7 +369,7 @@ class _LLMClient(BaseModel):
         tools: list[Tool | dict | MCPServer] | None = ...,
         cache: CachePattern | None = ...,
         use_responses_api: bool = ...,
-    ) -> list[APIResponse | None]: ...
+    ) -> list[APIResponse]: ...
     async def process_prompts_async(
         self,
@@ -380,7 +380,7 @@ class _LLMClient(BaseModel):
         tools: list[Tool | dict | MCPServer] | None = None,
         cache: CachePattern | None = None,
         use_responses_api: bool = False,
-    ) -> list[APIResponse | None] | list[str | None] | dict[str, int]:
+    ) -> list[APIResponse] | list[str | None] | dict[str, int]:
         """Process multiple prompts asynchronously using the start_nowait/wait_for_all backend.
         This implementation creates all tasks upfront and waits for them to complete,
@@ -516,28 +516,40 @@ class _LLMClient(BaseModel):
         tools: list[Tool | dict | MCPServer] | None = None,
         cache: CachePattern | None = None,
         use_responses_api: bool = False,
-    ) -> APIResponse | None:
+    ) -> APIResponse:
         task_id = self.start_nowait(
             prompt, tools=tools, cache=cache, use_responses_api=use_responses_api
         )
         return await self.wait_for(task_id)
-    async def wait_for(self, task_id: int) -> APIResponse | None:
+    async def wait_for(self, task_id: int) -> APIResponse:
         task = self._tasks.get(task_id)
         if task:
             return await task
-        return self._results.get(task_id)
+        res = self._results.get(task_id)
+        if res:
+            return res
+        else:
+            return APIResponse(
+                id=-1,
+                model_internal="",
+                prompt=Conversation([]),
+                sampling_params=SamplingParams(),
+                status_code=500,
+                is_error=True,
+                error_message="Task not found",
+            )
     async def wait_for_all(
         self, task_ids: Sequence[int] | None = None
-    ) -> list[APIResponse | None]:
+    ) -> list[APIResponse]:
         if task_ids is None:
             task_ids = list(self._tasks.keys())
         return [await self.wait_for(tid) for tid in task_ids]
     async def as_completed(
         self, task_ids: Sequence[int] | None = None
-    ) -> AsyncGenerator[tuple[int, APIResponse | None], None]:
+    ) -> AsyncGenerator[tuple[int, APIResponse], None]:
         """Yield ``(task_id, result)`` pairs as tasks complete.
         Args:
@@ -561,7 +573,9 @@ class _LLMClient(BaseModel):
         for task in list(tasks_map.keys()):
             if task.done():
                 tid = tasks_map.pop(task)
-                yield tid, self._results.get(tid, await task)
+                task_result = self._results.get(tid, await task)
+                assert task_result
+                yield tid, task_result
         while tasks_map:
             done, _ = await asyncio.wait(
@@ -569,7 +583,9 @@ class _LLMClient(BaseModel):
             )
             for task in done:
                 tid = tasks_map.pop(task)
-                yield tid, self._results.get(tid, await task)
+                task_result = self._results.get(tid, await task)
+                assert task_result
+                yield tid, task_result
     async def stream(
         self,

lm_deluge/models/__init__.py CHANGED Viewed

@@ -38,9 +38,9 @@ class APIModel:
     supports_responses: bool = False
     reasoning_model: bool = False
     regions: list[str] | dict[str, int] = field(default_factory=list)
-    tokens_per_minute: int | None = None
-    requests_per_minute: int | None = None
-    gpus: list[str] | None = None
+    # tokens_per_minute: int | None = None
+    # requests_per_minute: int | None = None
+    # gpus: list[str] | None = None
     @classmethod
     def from_registry(cls, name: str):
@@ -97,8 +97,8 @@ def register_model(
     supports_responses: bool = False,
     reasoning_model: bool = False,
     regions: list[str] | dict[str, int] = field(default_factory=list),
-    tokens_per_minute: int | None = None,
-    requests_per_minute: int | None = None,
+    # tokens_per_minute: int | None = None,
+    # requests_per_minute: int | None = None,
 ) -> APIModel:
     """Register a model configuration and return the created APIModel."""
     model = APIModel(
@@ -116,8 +116,8 @@ def register_model(
         supports_responses=supports_responses,
         reasoning_model=reasoning_model,
         regions=regions,
-        tokens_per_minute=tokens_per_minute,
-        requests_per_minute=requests_per_minute,
+        # tokens_per_minute=tokens_per_minute,
+        # requests_per_minute=requests_per_minute,
     )
     registry[model.id] = model
     return model

lm_deluge/models/anthropic.py CHANGED Viewed

@@ -10,6 +10,18 @@ ANTHROPIC_MODELS = {
     #                                                                   ░███
     #                                                                   █████
     #
+    "claude-4.5-haiku": {
+        "id": "claude-4.5-haiku",
+        "name": "claude-haiku-4-5-20251001",
+        "api_base": "https://api.anthropic.com/v1",
+        "api_key_env_var": "ANTHROPIC_API_KEY",
+        "supports_json": False,
+        "api_spec": "anthropic",
+        "input_cost": 1.0,
+        "cached_input_cost": 0.10,
+        "cache_write_cost": 1.25,
+        "output_cost": 3.0,
+    },
     "claude-4.5-sonnet": {
         "id": "claude-4.5-sonnet",
         "name": "claude-sonnet-4-5-20250929",
@@ -21,8 +33,6 @@ ANTHROPIC_MODELS = {
         "cached_input_cost": 0.30,
         "cache_write_cost": 3.75,
         "output_cost": 15.0,
-        "requests_per_minute": 4_000,
-        "tokens_per_minute": 400_000,
     },
     "claude-4.1-opus": {
         "id": "claude-4.1-opus",
@@ -35,8 +45,6 @@ ANTHROPIC_MODELS = {
         "cached_input_cost": 1.50,
         "cache_write_cost": 18.75,
         "output_cost": 75.0,
-        "requests_per_minute": 4_000,
-        "tokens_per_minute": 400_000,
         "reasoning_model": True,
     },
     "claude-4-opus": {
@@ -50,8 +58,6 @@ ANTHROPIC_MODELS = {
         "cached_input_cost": 1.50,
         "cache_write_cost": 18.75,
         "output_cost": 75.0,
-        "requests_per_minute": 4_000,
-        "tokens_per_minute": 400_000,
         "reasoning_model": True,
     },
     "claude-4-sonnet": {
@@ -65,8 +71,6 @@ ANTHROPIC_MODELS = {
         "cached_input_cost": 0.30,
         "cache_write_cost": 3.75,
         "output_cost": 15.0,
-        "requests_per_minute": 4_000,
-        "tokens_per_minute": 400_000,
     },
     "claude-3.7-sonnet": {
         "id": "claude-3.7-sonnet",
@@ -79,8 +83,6 @@ ANTHROPIC_MODELS = {
         "cached_input_cost": 0.30,
         "cache_write_cost": 3.75,
         "output_cost": 15.0,
-        "requests_per_minute": 4_000,
-        "tokens_per_minute": 400_000,
         "reasoning_model": True,
     },
     "claude-3.6-sonnet": {
@@ -94,8 +96,6 @@ ANTHROPIC_MODELS = {
         "cached_input_cost": 0.30,
         "cache_write_cost": 3.75,
         "output_cost": 15.0,
-        "requests_per_minute": 4_000,
-        "tokens_per_minute": 400_000,
     },
     "claude-3.5-sonnet": {
         "id": "claude-3.5-sonnet",
@@ -108,8 +108,6 @@ ANTHROPIC_MODELS = {
         "cached_input_cost": 0.30,
         "cache_write_cost": 3.75,
         "output_cost": 15.0,
-        "requests_per_minute": 4_000,
-        "tokens_per_minute": 400_000,
     },
     "claude-3-opus": {
         "id": "claude-3-opus",
@@ -120,8 +118,6 @@ ANTHROPIC_MODELS = {
         "api_spec": "anthropic",
         "input_cost": 15.0,
         "output_cost": 75.0,
-        "requests_per_minute": 4_000,
-        "tokens_per_minute": 400_000,
     },
     "claude-3.5-haiku": {
         "id": "claude-3.5-haiku",
@@ -134,8 +130,6 @@ ANTHROPIC_MODELS = {
         "cached_input_cost": 0.08,
         "cache_write_cost": 1.00,
         "output_cost": 4.00,
-        "requests_per_minute": 20_000,
-        "tokens_per_minute": 4_000_000,  # supposed to be this but they fucked up
     },
     "claude-3-haiku": {
         "id": "claude-3-haiku",
@@ -148,7 +142,5 @@ ANTHROPIC_MODELS = {
         "cache_write_cost": 0.30,
         "cached_input_cost": 0.03,
         "output_cost": 1.25,
-        "requests_per_minute": 10_000,
-        "tokens_per_minute": 4_000_000,  # supposed to be this but they fucked up
     },
 }

lm_deluge/models/bedrock.py CHANGED Viewed

@@ -16,8 +16,6 @@ BEDROCK_MODELS = {
         "api_spec": "bedrock",
         "input_cost": 0.25,
         "output_cost": 1.25,
-        "requests_per_minute": 4_000,
-        "tokens_per_minute": 8_000_000,
     },
     "claude-3.5-haiku-bedrock": {
         "id": "claude-3.5-haiku-bedrock",
@@ -28,8 +26,6 @@ BEDROCK_MODELS = {
         "api_spec": "bedrock",
         "input_cost": 0.25,
         "output_cost": 1.25,
-        "requests_per_minute": 4_000,
-        "tokens_per_minute": 8_000_000,
     },
     "claude-3.5-sonnet-bedrock": {
         "id": "claude-3.5-sonnet-bedrock",
@@ -40,8 +36,6 @@ BEDROCK_MODELS = {
         "api_spec": "bedrock",
         "input_cost": 3.0,
         "output_cost": 15.0,
-        "requests_per_minute": 4_000,
-        "tokens_per_minute": 400_000,
         "reasoning_model": False,
     },
     "claude-3.6-sonnet-bedrock": {
@@ -53,8 +47,6 @@ BEDROCK_MODELS = {
         "api_spec": "bedrock",
         "input_cost": 3.0,
         "output_cost": 15.0,
-        "requests_per_minute": 4_000,
-        "tokens_per_minute": 400_000,
         "reasoning_model": False,
     },
     "claude-3.7-sonnet-bedrock": {
@@ -66,8 +58,6 @@ BEDROCK_MODELS = {
         "api_spec": "bedrock",
         "input_cost": 3.0,
         "output_cost": 15.0,
-        "requests_per_minute": 4_000,
-        "tokens_per_minute": 400_000,
         "reasoning_model": True,
     },
     "claude-4-sonnet-bedrock": {
@@ -79,8 +69,6 @@ BEDROCK_MODELS = {
         "api_spec": "bedrock",
         "input_cost": 3.0,
         "output_cost": 15.0,
-        "requests_per_minute": 4_000,
-        "tokens_per_minute": 400_000,
         "reasoning_model": True,
     },
     "claude-4-opus-bedrock": {
@@ -92,8 +80,6 @@ BEDROCK_MODELS = {
         "api_spec": "bedrock",
         "input_cost": 3.0,
         "output_cost": 15.0,
-        "requests_per_minute": 4_000,
-        "tokens_per_minute": 400_000,
         "reasoning_model": True,
     },
     # GPT-OSS on AWS Bedrock

lm_deluge/models/cohere.py CHANGED Viewed

@@ -15,8 +15,6 @@ COHERE_MODELS = {
         "api_spec": "openai",
         "input_cost": 0.5,
         "output_cost": 1.5,
-        "requests_per_minute": 10_000,
-        "tokens_per_minute": None,
     },
     "aya-expanse-32b": {
         "id": "aya-expanse-32b",
@@ -26,8 +24,6 @@ COHERE_MODELS = {
         "api_spec": "openai",
         "input_cost": 0.5,
         "output_cost": 1.5,
-        "requests_per_minute": 10_000,
-        "tokens_per_minute": None,
     },
     "aya-vision-8b": {
         "id": "aya-vision-8b",
@@ -37,8 +33,6 @@ COHERE_MODELS = {
         "api_spec": "openai",
         "input_cost": 0.5,
         "output_cost": 1.5,
-        "requests_per_minute": 10_000,
-        "tokens_per_minute": None,
     },
     "aya-vision-32b": {
         "id": "aya-vision-32b",
@@ -48,8 +42,6 @@ COHERE_MODELS = {
         "api_spec": "openai",
         "input_cost": 0.5,
         "output_cost": 1.5,
-        "requests_per_minute": 10_000,
-        "tokens_per_minute": None,
     },
     "command-a": {
         "id": "command-a",
@@ -59,8 +51,6 @@ COHERE_MODELS = {
         "api_spec": "openai",
         "input_cost": 0.5,
         "output_cost": 1.5,
-        "requests_per_minute": 10_000,
-        "tokens_per_minute": None,
     },
     "command-r-7b": {
         "id": "command-r-cohere",
@@ -70,8 +60,6 @@ COHERE_MODELS = {
         "api_spec": "openai",
         "input_cost": 0.5,
         "output_cost": 1.5,
-        "requests_per_minute": 10_000,
-        "tokens_per_minute": None,
     },
     "command-r": {
         "id": "command-r",
@@ -81,8 +69,6 @@ COHERE_MODELS = {
         "api_spec": "openai",
         "input_cost": 0.5,
         "output_cost": 1.5,
-        "requests_per_minute": 10_000,
-        "tokens_per_minute": None,
     },
     "command-r-plus": {
         "id": "command-r-plus",
@@ -92,7 +78,5 @@ COHERE_MODELS = {
         "api_spec": "openai",
         "input_cost": 3.0,
         "output_cost": 15.0,
-        "requests_per_minute": 10_000,
-        "tokens_per_minute": None,
     },
 }

lm_deluge/models/google.py CHANGED Viewed

@@ -20,8 +20,6 @@ GOOGLE_MODELS = {
         "input_cost": 0.1,
         "cached_input_cost": 0.025,
         "output_cost": 0.4,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": False,
     },
     "gemini-2.0-flash-lite-compat": {
@@ -34,8 +32,6 @@ GOOGLE_MODELS = {
         "api_spec": "openai",
         "input_cost": 0.075,
         "output_cost": 0.3,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": False,
     },
     "gemini-2.5-pro-compat": {
@@ -49,8 +45,6 @@ GOOGLE_MODELS = {
         "input_cost": 1.25,
         "cached_input_cost": 0.31,
         "output_cost": 10.0,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": True,
     },
     "gemini-2.5-flash-compat": {
@@ -64,8 +58,6 @@ GOOGLE_MODELS = {
         "input_cost": 0.3,
         "cached_input_cost": 0.075,
         "output_cost": 2.5,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": True,
     },
     "gemini-2.5-flash-lite-compat": {
@@ -79,8 +71,6 @@ GOOGLE_MODELS = {
         "input_cost": 0.1,
         "cached_input_cost": 0.025,
         "output_cost": 0.4,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": True,
     },
     # Native Gemini API versions with file support
@@ -95,8 +85,6 @@ GOOGLE_MODELS = {
         "input_cost": 0.1,
         "cached_input_cost": 0.025,
         "output_cost": 0.4,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": False,
     },
     "gemini-2.0-flash-lite": {
@@ -109,8 +97,6 @@ GOOGLE_MODELS = {
         "api_spec": "gemini",
         "input_cost": 0.075,
         "output_cost": 0.3,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": False,
     },
     "gemini-2.5-pro": {
@@ -124,8 +110,6 @@ GOOGLE_MODELS = {
         "input_cost": 1.25,
         "cached_input_cost": 0.31,
         "output_cost": 10.0,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": True,
     },
     "gemini-2.5-flash": {
@@ -139,8 +123,6 @@ GOOGLE_MODELS = {
         "input_cost": 0.3,
         "cached_input_cost": 0.075,
         "output_cost": 2.5,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": True,
     },
     "gemini-2.5-flash-lite": {
@@ -154,8 +136,6 @@ GOOGLE_MODELS = {
         "input_cost": 0.1,
         "cached_input_cost": 0.025,
         "output_cost": 0.4,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": True,
     },
 }

lm_deluge/models/grok.py CHANGED Viewed

@@ -7,6 +7,54 @@ XAI_MODELS = {
     # 888    888 888    888  888 888888K
     # Y88b  d88P 888    Y88..88P 888 "88b
     #  "Y8888P88 888     "Y88P"  888  888
+    "grok-code-fast-1": {
+        "id": "grok-code-fast-1",
+        "name": "grok-code-fast-1",
+        "api_base": "https://api.x.ai/v1",
+        "api_key_env_var": "GROK_API_KEY",
+        "supports_json": True,
+        "supports_logprobs": True,
+        "api_spec": "openai",
+        "input_cost": 0.2,
+        "output_cost": 1.5,
+        "reasoning_model": False,
+    },
+    "grok-4-fast-reasoning": {
+        "id": "grok-4-fast-reasoning",
+        "name": "grok-4-fast-reasoning",
+        "api_base": "https://api.x.ai/v1",
+        "api_key_env_var": "GROK_API_KEY",
+        "supports_json": True,
+        "supports_logprobs": True,
+        "api_spec": "openai",
+        "input_cost": 0.2,
+        "output_cost": 0.5,
+        "reasoning_model": False,
+    },
+    "grok-4-fast-non-reasoning": {
+        "id": "grok-4-fast-non-reasoning",
+        "name": "grok-4-fast-non-reasoning",
+        "api_base": "https://api.x.ai/v1",
+        "api_key_env_var": "GROK_API_KEY",
+        "supports_json": True,
+        "supports_logprobs": True,
+        "api_spec": "openai",
+        "input_cost": 0.2,
+        "output_cost": 0.5,
+        "reasoning_model": False,
+    },
+    "grok-4": {
+        "id": "grok-4",
+        "name": "grok-4-0709",
+        "api_base": "https://api.x.ai/v1",
+        "api_key_env_var": "GROK_API_KEY",
+        "supports_json": True,
+        "supports_logprobs": True,
+        "api_spec": "openai",
+        "input_cost": 2.0,
+        "output_cost": 8.0,
+        "reasoning_model": False,
+    },
     "grok-3": {
         "id": "grok-3",
         "name": "grok-3-latest",
@@ -17,8 +65,6 @@ XAI_MODELS = {
         "api_spec": "openai",
         "input_cost": 2.0,
         "output_cost": 8.0,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": False,
     },
     "grok-3-mini": {
@@ -31,8 +77,6 @@ XAI_MODELS = {
         "api_spec": "openai",
         "input_cost": 2.0,
         "output_cost": 8.0,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": True,
     },
 }

lm_deluge/models/groq.py CHANGED Viewed

@@ -41,10 +41,10 @@ GROQ_MODELS = {
     },
     "kimi-k2-groq": {
         "id": "kimi-k2-groq",
-        "name": "moonshotai/kimi-k2-instruct",
+        "name": "moonshotai/kimi-k2-instruct-0905",
         "api_base": "https://api.groq.com/openai/v1",
         "api_key_env_var": "GROQ_API_KEY",
-        "supports_json": False,
+        "supports_json": True,
         "api_spec": "openai",
     },
     "gpt-oss-120b-groq": {

lm_deluge/models/meta.py CHANGED Viewed

@@ -16,8 +16,6 @@ META_MODELS = {
         "api_spec": "openai",
         "input_cost": 0.0,
         "output_cost": 0.0,
-        "requests_per_minute": 3_000,
-        "tokens_per_minute": 1_000_000,
         "reasoning_model": False,
     },
     "llama-4-maverick": {
@@ -30,8 +28,6 @@ META_MODELS = {
         "api_spec": "openai",
         "input_cost": 0.0,
         "output_cost": 0.0,
-        "requests_per_minute": 3_000,
-        "tokens_per_minute": 1_000_000,
         "reasoning_model": False,
     },
     "llama-3.3-70b": {
@@ -44,8 +40,6 @@ META_MODELS = {
         "api_spec": "openai",
         "input_cost": 0.0,
         "output_cost": 0.0,
-        "requests_per_minute": 3_000,
-        "tokens_per_minute": 1_000_000,
         "reasoning_model": False,
     },
     "llama-3.3-8b": {
@@ -58,8 +52,6 @@ META_MODELS = {
         "api_spec": "openai",
         "input_cost": 0.0,
         "output_cost": 0.0,
-        "requests_per_minute": 3_000,
-        "tokens_per_minute": 1_000_000,
         "reasoning_model": False,
     },
 }

lm_deluge/models/openai.py CHANGED Viewed

@@ -77,8 +77,6 @@ OPENAI_MODELS = {
         "api_spec": "openai",
         "input_cost": 3.0,
         "output_cost": 12.0,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": False,
     },
     "o3": {
@@ -93,8 +91,6 @@ OPENAI_MODELS = {
         "input_cost": 2.0,
         "cached_input_cost": 0.50,
         "output_cost": 8.0,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": True,
     },
     "o4-mini": {
@@ -109,8 +105,6 @@ OPENAI_MODELS = {
         "input_cost": 1.1,
         "cached_input_cost": 0.275,
         "output_cost": 4.4,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": True,
     },
     "gpt-4.1": {
@@ -125,8 +119,6 @@ OPENAI_MODELS = {
         "input_cost": 2.0,
         "cached_input_cost": 0.50,
         "output_cost": 8.0,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": False,
     },
     "gpt-4.1-mini": {
@@ -141,8 +133,6 @@ OPENAI_MODELS = {
         "input_cost": 0.4,
         "cached_input_cost": 0.10,
         "output_cost": 1.6,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": False,
     },
     "gpt-4.1-nano": {
@@ -157,8 +147,6 @@ OPENAI_MODELS = {
         "input_cost": 0.1,
         "cached_input_cost": 0.025,
         "output_cost": 0.4,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": False,
     },
     "gpt-4.5": {
@@ -172,8 +160,6 @@ OPENAI_MODELS = {
         "api_spec": "openai",
         "input_cost": 75.0,
         "output_cost": 150.0,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": False,
     },
     "o3-mini": {
@@ -188,8 +174,6 @@ OPENAI_MODELS = {
         "input_cost": 1.1,
         "cached_input_cost": 0.55,
         "output_cost": 4.4,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": True,
     },
     "o1": {
@@ -204,8 +188,6 @@ OPENAI_MODELS = {
         "input_cost": 15.0,
         "cached_input_cost": 7.50,
         "output_cost": 60.0,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": True,
     },
     "o1-preview": {
@@ -219,8 +201,6 @@ OPENAI_MODELS = {
         "api_spec": "openai",
         "input_cost": 15.0,
         "output_cost": 60.0,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": True,
     },
     "o1-mini": {
@@ -235,8 +215,6 @@ OPENAI_MODELS = {
         "input_cost": 1.1,
         "cached_input_cost": 0.55,
         "output_cost": 4.4,
-        "requests_per_minute": 20,
-        "tokens_per_minute": 100_000,
         "reasoning_model": True,
     },
     "gpt-4o": {
@@ -251,8 +229,6 @@ OPENAI_MODELS = {
         "input_cost": 2.50,
         "cached_input_cost": 1.25,
         "output_cost": 10.0,
-        "requests_per_minute": 10_000,
-        "tokens_per_minute": 30_000_000,
     },
     "gpt-4o-mini": {
         "id": "gpt-4o-mini",
@@ -266,8 +242,6 @@ OPENAI_MODELS = {
         "input_cost": 0.15,
         "cached_input_cost": 0.075,
         "output_cost": 0.6,
-        "requests_per_minute": 60_000,
-        "tokens_per_minute": 250_000_000,
     },
     "gpt-3.5-turbo": {
         "id": "gpt-3.5-turbo",
@@ -280,8 +254,6 @@ OPENAI_MODELS = {
         "api_spec": "openai",
         "input_cost": 0.5,
         "output_cost": 1.5,
-        "requests_per_minute": 40_000,
-        "tokens_per_minute": 75_000_000,
     },
     "gpt-4-turbo": {
         "id": "gpt-4-turbo",
@@ -294,8 +266,6 @@ OPENAI_MODELS = {
         "api_spec": "openai",
         "input_cost": 10.0,
         "output_cost": 30.0,
-        "requests_per_minute": 10_000,
-        "tokens_per_minute": 1_500_000,
     },
     "gpt-4": {
         "id": "gpt-4",
@@ -308,8 +278,6 @@ OPENAI_MODELS = {
         "api_spec": "openai",
         "input_cost": 30.0,
         "output_cost": 60.0,
-        "requests_per_minute": 10_000,
-        "tokens_per_minute": 300_000,
     },
     "gpt-4-32k": {
         "id": "gpt-4-32k",
@@ -322,7 +290,5 @@ OPENAI_MODELS = {
         "api_spec": "openai",
         "input_cost": 60.0,
         "output_cost": 120.0,
-        "requests_per_minute": 1_000,
-        "tokens_per_minute": 150_000,
     },
 }

lm_deluge/models/openrouter.py CHANGED Viewed

@@ -1 +1,64 @@
-OPENROUTER_MODELS = {}
+OPENROUTER_MODELS = {
+    "glm-4.6-openrouter": {
+        "id": "glm-4.6-openrouter",
+        "name": "z-ai/glm-4.6",
+        "api_base": "https://openrouter.ai/api/v1",
+        "api_key_env_var": "OPENROUTER_API_KEY",
+        "supports_json": True,
+        "api_spec": "openai",
+        "input_cost": 0.6,
+        "cached_input_cost": 0.11,
+        "cache_write_cost": 0.6,
+        "output_cost": 2.20,
+    },
+    "deepseek-r1-openrouter": {
+        "id": "deepseek-r1-openrouter",
+        "name": "deepseek/deepseek-r1-0528",
+        "api_base": "https://openrouter.ai/api/v1",
+        "api_key_env_var": "OPENROUTER_API_KEY",
+        "supports_json": True,
+        "api_spec": "openai",
+        "input_cost": 0.40,
+        "cached_input_cost": 0.40,
+        "cache_write_cost": 0.40,
+        "output_cost": 1.75,
+    },
+    "deepseek-3.1-openrouter": {
+        "id": "deepseek-3.1-openrouter",
+        "name": "deepseek/deepseek-v3.1-terminus",
+        "api_base": "https://openrouter.ai/api/v1",
+        "api_key_env_var": "OPENROUTER_API_KEY",
+        "supports_json": True,
+        "api_spec": "openai",
+        "input_cost": 0.23,
+        "cached_input_cost": 0.23,
+        "cache_write_cost": 0.23,
+        "output_cost": 0.9,
+    },
+    "deepseek-3.2-openrouter": {
+        "id": "deepseek-3.2-openrouter",
+        "name": "deepseek/deepseek-v3.2-exp",
+        "api_base": "https://openrouter.ai/api/v1",
+        "api_key_env_var": "OPENROUTER_API_KEY",
+        "supports_json": True,
+        "api_spec": "openai",
+        "input_cost": 0.27,
+        "cached_input_cost": 0.27,
+        "cache_write_cost": 0.27,
+        "output_cost": 0.4,
+    },
+    # "gpt-oss-20b-openrouter": {},
+    # "gpt-oss-120b-openrouter": {},
+    "kimi-k2-openrouter": {
+        "id": "kimi-k2-openrouter",
+        "name": "z-ai/glm-4.6",
+        "api_base": "https://openrouter.ai/api/v1",
+        "api_key_env_var": "OPENROUTER_API_KEY",
+        "supports_json": True,
+        "api_spec": "openai",
+        "input_cost": 0.6,
+        "cached_input_cost": 0.11,
+        "cache_write_cost": 0.6,
+        "output_cost": 2.20,
+    },
+}

lm_deluge/models/together.py CHANGED Viewed

@@ -20,8 +20,6 @@ TOGETHER_MODELS = {
         "api_spec": "openai",
         "input_cost": 3.0,
         "output_cost": 7.0,
-        "requests_per_minute": None,
-        "tokens_per_minute": None,
     },
     "deepseek-v3-together": {
         "id": "deepseek-v3-together",
@@ -32,8 +30,6 @@ TOGETHER_MODELS = {
         "api_spec": "openai",
         "input_cost": 1.25,
         "output_cost": 1.25,
-        "requests_per_minute": None,
-        "tokens_per_minute": None,
     },
     "qwen-3-235b-together": {
         "id": "qwen-3-235b-together",
@@ -44,8 +40,6 @@ TOGETHER_MODELS = {
         "api_spec": "openai",
         "input_cost": 0.2,
         "output_cost": 0.6,
-        "requests_per_minute": None,
-        "tokens_per_minute": None,
     },
     "qwen-2.5-vl-together": {
         "id": "qwen-2.5-vl-together",
@@ -56,8 +50,6 @@ TOGETHER_MODELS = {
         "api_spec": "openai",
         "input_cost": 1.95,
         "output_cost": 8.0,
-        "requests_per_minute": None,
-        "tokens_per_minute": None,
     },
     "llama-4-maverick-together": {
         "id": "llama-4-maverick-together",
@@ -68,8 +60,6 @@ TOGETHER_MODELS = {
         "api_spec": "openai",
         "input_cost": 0.27,
         "output_cost": 0.85,
-        "requests_per_minute": None,
-        "tokens_per_minute": None,
     },
     "llama-4-scout-together": {
         "id": "llama-4-scout-together",
@@ -80,8 +70,6 @@ TOGETHER_MODELS = {
         "api_spec": "openai",
         "input_cost": 0.18,
         "output_cost": 0.59,
-        "requests_per_minute": None,
-        "tokens_per_minute": None,
     },
     "gpt-oss-120b-together": {
         "id": "gpt-oss-120b-together",
@@ -92,8 +80,6 @@ TOGETHER_MODELS = {
         "api_spec": "openai",
         "input_cost": 0.18,
         "output_cost": 0.59,
-        "requests_per_minute": None,
-        "tokens_per_minute": None,
         "reasoning_model": True,
     },
     "gpt-oss-20b-together": {
@@ -105,8 +91,6 @@ TOGETHER_MODELS = {
         "api_spec": "openai",
         "input_cost": 0.18,
         "output_cost": 0.59,
-        "requests_per_minute": None,
-        "tokens_per_minute": None,
         "reasoning_model": True,
     },
 }

{lm_deluge-0.0.57.dist-info → lm_deluge-0.0.58.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lm_deluge
-Version: 0.0.57
+Version: 0.0.58
 Summary: Python utility for using LLM API models.
 Author-email: Benjamin Anderson <ben@trytaylor.ai>
 Requires-Python: >=3.10

{lm_deluge-0.0.57.dist-info → lm_deluge-0.0.58.dist-info}/RECORD RENAMED Viewed

@@ -2,7 +2,7 @@ lm_deluge/__init__.py,sha256=LKKIcqQoQyDpTck6fnB7iAs75BnfNNa3Bj5Nz7KU4Hk,376
 lm_deluge/batches.py,sha256=rQocJLyIs3Ko_nRdAE9jT__5cKWYxiIRAH_Lw3L0E1k,24653
 lm_deluge/cache.py,sha256=xO2AIYvP3tUpTMKQjwQQYfGRJSRi6e7sMlRhLjsS-u4,4873
 lm_deluge/cli.py,sha256=Ilww5gOw3J5v0NReq_Ra4hhxU4BCIJBl1oTGxJZKedc,12065
-lm_deluge/client.py,sha256=GaHS54c2_MFn3AcUQPZOYrwKpnYYud_OfQIfwx3BAWU,32423
+lm_deluge/client.py,sha256=1ZxQAWkmtz-zhW4E8rfU2V4BfzvqGsKhvqz_CB63-lc,32894
 lm_deluge/config.py,sha256=H1tQyJDNHGFuwxqQNL5Z-CjWAC0luHSBA3iY_pxmACM,932
 lm_deluge/embed.py,sha256=CO-TOlC5kOTAM8lcnicoG4u4K664vCBwHF1vHa-nAGg,13382
 lm_deluge/errors.py,sha256=oHjt7YnxWbh-eXMScIzov4NvpJMo0-2r5J6Wh5DQ1tk,209
@@ -15,7 +15,7 @@ lm_deluge/tool.py,sha256=eZpzgkSIlGD7KdZQwzLF-UdyRJpRnNNXpceGJrNhRrE,26421
 lm_deluge/tracker.py,sha256=aeS9GUJpgOSQRVXAnGDvlMO8qYpSxpTNLYj2hrMg0m8,14757
 lm_deluge/usage.py,sha256=xz9tAw2hqaJvv9aAVhnQ6N1Arn7fS8Shb28VwCW26wI,5136
 lm_deluge/api_requests/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lm_deluge/api_requests/anthropic.py,sha256=Iy-AMo1o7xliwWhamFIUc601PZ0YWLhwAgszgfws42I,8467
+lm_deluge/api_requests/anthropic.py,sha256=7tTb_NMPodDHrCzakrLd9LyXuLqeTQyAGU-FvMoV3gI,8437
 lm_deluge/api_requests/base.py,sha256=1et-5SdRqfnvXZT3b9fBEx0vvbCwbVunHBWtQr7Wurg,5878
 lm_deluge/api_requests/bedrock.py,sha256=GmVxXz3ERAeQ7e52Nlztt81O4H9eJOQeOnS6b65vjm4,15453
 lm_deluge/api_requests/common.py,sha256=BZ3vRO5TB669_UsNKugkkuFSzoLHOYJIKt4nV4sf4vc,422
@@ -41,21 +41,21 @@ lm_deluge/llm_tools/locate.py,sha256=lYNbKTmy9dTvj0lEQkOQ7yrxyqsgYzjD0C_byJKI_4w
 lm_deluge/llm_tools/ocr.py,sha256=7fDlvs6uUOvbxMasvGGNJx5Fj6biM6z3lijKZaGN26k,23
 lm_deluge/llm_tools/score.py,sha256=9oGA3-k2U5buHQXkXaEI9M4Wb5yysNhTLsPbGeghAlQ,2580
 lm_deluge/llm_tools/translate.py,sha256=iXyYvQZ8bC44FWhBk4qpdqjKM1WFF7Shq-H2PxhPgg4,1452
-lm_deluge/models/__init__.py,sha256=qlpGDoTC89dKOFW3KxLUMiHCg_OzpRYHyrCt0OiSW7c,4525
-lm_deluge/models/anthropic.py,sha256=qAsykXPDz0dK8o4h9vP1QtO-3am3VDzhsYBl4YhEsds,6734
-lm_deluge/models/bedrock.py,sha256=PIaXvho2agCm1hSSAEy8zHCITjApXT2eUOGDKW425tE,5424
+lm_deluge/models/__init__.py,sha256=7HNEnpxpEguZYjcudY_9oJ79hOOLo0oNUvG-kwkEpv4,4539
+lm_deluge/models/anthropic.py,sha256=5j75sB40yZzT1wwKC7Dh0f2Y2cXnp8yxHuXW63PCuns,6285
+lm_deluge/models/bedrock.py,sha256=g1PbfceSRH2lWST3ja0mUlF3oTq4e4T-si6RMe7qXgg,4888
 lm_deluge/models/cerebras.py,sha256=u2FMXJF6xMr0euDRKLKMo_NVTOcvSrrEpehbHr8sSeE,2050
-lm_deluge/models/cohere.py,sha256=M_7cVA9QD4qe1X4sZXCpKEkKrKz2jibaspiTnzsZ1GU,3998
+lm_deluge/models/cohere.py,sha256=iXjYtM6jy_YL73Op8OfNsrMNopwae9y-Sw-4vF9cEBw,3406
 lm_deluge/models/deepseek.py,sha256=6_jDEprNNYis5I5MDQNloRes9h1P6pMYHXxOd2UZMgg,941
 lm_deluge/models/fireworks.py,sha256=yvt2Ggzye4aUqCqY74ta67Vu7FrQaLFjdFtN4P7D-dc,638
-lm_deluge/models/google.py,sha256=_spZkMBuUkWTHhb_Z7_Nq75l_3QF7aUtlk-Wyh6pWEI,6117
-lm_deluge/models/grok.py,sha256=aInkUSclXE47Lm4PKiP3OebAP9V-GOZwK-Eiis4zVow,1199
-lm_deluge/models/groq.py,sha256=djBs9N8LpzE0BQSb4KiY6F06B4f8csn-fB_5wfQTpNU,2548
-lm_deluge/models/meta.py,sha256=m6HPR82TJONYTTWkQw5EKmITMxoWzrfYOuNgFnGaRX8,2195
+lm_deluge/models/google.py,sha256=Hr2MolQoaeY85pKCGO7k7OH_1nQJdrwMgrJbfz5bI8w,5387
+lm_deluge/models/grok.py,sha256=TDzr8yfTaHbdJhwMA-Du6L-efaKFJhjTQViuVElCCHI,2566
+lm_deluge/models/groq.py,sha256=Mi5WE1xOBGoZlymD0UN6kzhH_NOmfJYU4N2l-TO0Z8Q,2552
+lm_deluge/models/meta.py,sha256=BBgnscL1gMcIdPbRqrlDl_q9YAYGSrkw9JkAIabXtLs,1883
 lm_deluge/models/mistral.py,sha256=x67o5gckBGmPcIGdVbS26XZAYFKBYM4tsxEAahGp8bk,4323
-lm_deluge/models/openai.py,sha256=vp-VcTi21N7M-Lvohx4RFkvqCl-L-UwwWH0A8GwYoX8,11452
-lm_deluge/models/openrouter.py,sha256=aAgBT5_TZQtUPQyNn-Bob6NGyrlFOclnxIb0F53pgvA,23
-lm_deluge/models/together.py,sha256=RCZoYAb8OVxdH9uwXnv47TDTGzC30P-FZoDbiBE23_g,4957
+lm_deluge/models/openai.py,sha256=HC_oNLmKkmShkcfeUgyhesACtXGg__I2WiIIDrN-X84,10176
+lm_deluge/models/openrouter.py,sha256=O-Po4tmHjAqFIVU96TUL0QnK01R4e2yDN7Z4sYJ-CuE,2120
+lm_deluge/models/together.py,sha256=AjKhPsazqBgqyLwHkNQW07COM1n_oSrYQRp2BFVvn9o,4381
 lm_deluge/presets/cerebras.py,sha256=MDkqj15qQRrj8wxSCDNNe_Cs7h1WN1UjV6lTmSY1olQ,479
 lm_deluge/presets/meta.py,sha256=QrreLAVgYS6VIC_NQth1vgGAYuxY38jFQQZSe6ot7C8,364
 lm_deluge/util/harmony.py,sha256=XBfJck6q-5HbOqMhEjdfy1i17i0QtpHG8ruXV4EsHl0,2731
@@ -64,8 +64,8 @@ lm_deluge/util/logprobs.py,sha256=UkBZakOxWluaLqHrjARu7xnJ0uCHVfLGHJdnYlEcutk,11
 lm_deluge/util/spatial.py,sha256=BsF_UKhE-x0xBirc-bV1xSKZRTUhsOBdGqsMKme20C8,4099
 lm_deluge/util/validation.py,sha256=hz5dDb3ebvZrZhnaWxOxbNSVMI6nmaOODBkk0htAUhs,1575
 lm_deluge/util/xml.py,sha256=Ft4zajoYBJR3HHCt2oHwGfymGLdvp_gegVmJ-Wqk4Ck,10547
-lm_deluge-0.0.57.dist-info/licenses/LICENSE,sha256=uNNXGXPCw2TC7CUs7SEBkA-Mz6QBQFWUUEWDMgEs1dU,1058
-lm_deluge-0.0.57.dist-info/METADATA,sha256=HqZgYHU7B-Qkab-tAFUMmuYG0hwhIHVGn6inJK7Poe8,13443
-lm_deluge-0.0.57.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lm_deluge-0.0.57.dist-info/top_level.txt,sha256=hqU-TJX93yBwpgkDtYcXyLr3t7TLSCCZ_reytJjwBaE,10
-lm_deluge-0.0.57.dist-info/RECORD,,
+lm_deluge-0.0.58.dist-info/licenses/LICENSE,sha256=uNNXGXPCw2TC7CUs7SEBkA-Mz6QBQFWUUEWDMgEs1dU,1058
+lm_deluge-0.0.58.dist-info/METADATA,sha256=jyhXeGVPAMMYBGm3omp6MKZfQGlRX-ow_9fI58ZZNGg,13443
+lm_deluge-0.0.58.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lm_deluge-0.0.58.dist-info/top_level.txt,sha256=hqU-TJX93yBwpgkDtYcXyLr3t7TLSCCZ_reytJjwBaE,10
+lm_deluge-0.0.58.dist-info/RECORD,,

{lm_deluge-0.0.57.dist-info → lm_deluge-0.0.58.dist-info}/WHEEL RENAMED Viewed

File without changes

{lm_deluge-0.0.57.dist-info → lm_deluge-0.0.58.dist-info}/licenses/LICENSE RENAMED Viewed

File without changes

{lm_deluge-0.0.57.dist-info → lm_deluge-0.0.58.dist-info}/top_level.txt RENAMED Viewed

File without changes

lm-deluge 0.0.57__py3-none-any.whl → 0.0.58__py3-none-any.whl

Potentially problematic release.

lm-deluge 0.0.57py3-none-any.whl → 0.0.58py3-none-any.whl