edsl 0.1.38.dev3__py3-none-any.whl → 0.1.39__py3-none-any.whl

edsl/inference_services/data_structures.py

@@ -0,0 +1,134 @@
+from collections import UserDict, defaultdict, UserList
+from typing import Union, Optional, List
+from edsl.enums import InferenceServiceLiteral
+from dataclasses import dataclass
+
+
+@dataclass
+class LanguageModelInfo:
+    """A dataclass for storing information about a language model.
+
+
+    >>> LanguageModelInfo("gpt-4-1106-preview", "openai")
+    LanguageModelInfo(model_name='gpt-4-1106-preview', service_name='openai')
+
+    >>> model_name, service = LanguageModelInfo.example()
+    >>> model_name
+    'gpt-4-1106-preview'
+
+    >>> LanguageModelInfo.example().service_name
+    'openai'
+
+    """
+
+    model_name: str
+    service_name: str
+
+    def __iter__(self):
+        yield self.model_name
+        yield self.service_name
+
+    def __getitem__(self, key: int) -> str:
+        import warnings
+
+        warnings.warn(
+            "Accessing LanguageModelInfo via index is deprecated. "
+            "Please use .model_name, .service_name, or .index attributes instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+
+        if key == 0:
+            return self.model_name
+        elif key == 1:
+            return self.service_name
+        else:
+            raise IndexError("Index out of range")
+
+    @classmethod
+    def example(cls) -> "LanguageModelInfo":
+        return cls("gpt-4-1106-preview", "openai")
+
+
+class ModelNamesList(UserList):
+    pass
+
+
+class AvailableModels(UserList):
+
+    def __init__(self, data: List[LanguageModelInfo]) -> None:
+        super().__init__(data)
+
+    def __contains__(self, model_name: str) -> bool:
+        for model_entry in self:
+            if model_entry.model_name == model_name:
+                return True
+        return False
+
+    def print(self):
+        return self.to_dataset().print()
+
+    def to_dataset(self):
+        from edsl.scenarios.ScenarioList import ScenarioList
+
+        models, services = zip(
+            *[(model.model_name, model.service_name) for model in self]
+        )
+        return (
+            ScenarioList.from_list("model", models)
+            .add_list("service", services)
+            .to_dataset()
+        )
+
+    def to_model_list(self):
+        from edsl.language_models.ModelList import ModelList
+
+        return ModelList.from_available_models(self)
+
+    def search(
+        self, pattern: str, service_name: Optional[str] = None, regex: bool = False
+    ) -> "AvailableModels":
+        import re
+
+        if not regex:
+            # Escape special regex characters except *
+            pattern = re.escape(pattern).replace(r"\*", ".*")
+
+        try:
+            regex = re.compile(pattern)
+            avm = AvailableModels(
+                [
+                    entry
+                    for entry in self
+                    if regex.search(entry.model_name)
+                    and (service_name is None or entry.service_name == service_name)
+                ]
+            )
+            if len(avm) == 0:
+                raise ValueError(
+                    "No models found matching the search pattern: " + pattern
+                )
+            else:
+                return avm
+        except re.error as e:
+            raise ValueError(f"Invalid regular expression pattern: {e}")
+
+
+class ServiceToModelsMapping(UserDict):
+    def __init__(self, data: dict) -> None:
+        super().__init__(data)
+
+    @property
+    def service_names(self) -> list[str]:
+        return list(self.data.keys())
+
+    def _validate_service_names(self):
+        for service in self.service_names:
+            if service not in InferenceServiceLiteral:
+                raise ValueError(f"Invalid service name: {service}")
+
+    def model_to_services(self) -> dict:
+        self._model_to_service = defaultdict(list)
+        for service, models in self.data.items():
+            for model in models:
+                self._model_to_service[model].append(service)

edsl/inference_services/models_available_cache.py

@@ -1,118 +1,118 @@
-models_available = {
-    "openai": [
-        "gpt-3.5-turbo-1106",
-        "gpt-4-0125-preview",
-        "gpt-4-turbo-preview",
-        "gpt-3.5-turbo-16k",
-        "gpt-4-1106-preview",
-        "gpt-4-turbo-2024-04-09",
-        "gpt-3.5-turbo-16k-0613",
-        "gpt-4o-2024-05-13",
-        "gpt-4-turbo",
-        "gpt-3.5-turbo-0613",
-        "gpt-4",
-        "gpt-4-0613",
-        "gpt-3.5-turbo-0125",
-        "gpt-3.5-turbo",
-        "gpt-3.5-turbo-instruct",
-        "gpt-3.5-turbo-instruct-0914",
-        "gpt-3.5-turbo-0301",
-        "gpt-4-vision-preview",
-        "gpt-4-1106-vision-preview",
-        "gpt-4o",
-    ],
-    "anthropic": [
-        "claude-3-5-sonnet-20240620",
-        "claude-3-opus-20240229",
-        "claude-3-sonnet-20240229",
-        "claude-3-haiku-20240307",
-    ],
-    "deep_infra": [
-        "meta-llama/Llama-2-13b-chat-hf",
-        "mistralai/Mixtral-8x22B-Instruct-v0.1",
-        "Gryphe/MythoMax-L2-13b-turbo",
-        "mistralai/Mistral-7B-Instruct-v0.1",
-        "Austism/chronos-hermes-13b-v2",
-        "meta-llama/Llama-2-70b-chat-hf",
-        "mistralai/Mistral-7B-Instruct-v0.3",
-        "meta-llama/Llama-2-7b-chat-hf",
-        "Qwen/Qwen2-72B-Instruct",
-        "HuggingFaceH4/zephyr-orpo-141b-A35b-v0.1",
-        "cognitivecomputations/dolphin-2.6-mixtral-8x7b",
-        "bigcode/starcoder2-15b",
-        "microsoft/WizardLM-2-8x22B",
-        "codellama/CodeLlama-70b-Instruct-hf",
-        "Gryphe/MythoMax-L2-13b",
-        "microsoft/WizardLM-2-7B",
-        "01-ai/Yi-34B-Chat",
-        "bigcode/starcoder2-15b-instruct-v0.1",
-        "mistralai/Mixtral-8x7B-Instruct-v0.1",
-        "openchat/openchat-3.6-8b",
-        "meta-llama/Meta-Llama-3-8B-Instruct",
-        "microsoft/Phi-3-medium-4k-instruct",
-        "Phind/Phind-CodeLlama-34B-v2",
-        "google/codegemma-7b-it",
-        "mistralai/Mistral-7B-Instruct-v0.2",
-        "deepinfra/airoboros-70b",
-        "mistralai/Mixtral-8x22B-v0.1",
-        "llava-hf/llava-1.5-7b-hf",
-        "codellama/CodeLlama-34b-Instruct-hf",
-        "google/gemma-1.1-7b-it",
-        "lizpreciatior/lzlv_70b_fp16_hf",
-        "databricks/dbrx-instruct",
-        "nvidia/Nemotron-4-340B-Instruct",
-        "Qwen/Qwen2-7B-Instruct",
-        "meta-llama/Meta-Llama-3-70B-Instruct",
-        "openchat/openchat_3.5",
-    ],
-    "google": [
-        "gemini-1.0-pro",
-        "gemini-1.0-pro-001",
-        "gemini-1.0-pro-latest",
-        "gemini-1.0-pro-vision-latest",
-        "gemini-1.5-flash",
-        "gemini-1.5-flash-001",
-        "gemini-1.5-flash-001-tuning",
-        "gemini-1.5-flash-002",
-        "gemini-1.5-flash-8b",
-        "gemini-1.5-flash-8b-001",
-        "gemini-1.5-flash-8b-exp-0827",
-        "gemini-1.5-flash-8b-exp-0924",
-        "gemini-1.5-flash-8b-latest",
-        "gemini-1.5-flash-exp-0827",
-        "gemini-1.5-flash-latest",
-        "gemini-1.5-pro",
-        "gemini-1.5-pro-001",
-        "gemini-1.5-pro-002",
-        "gemini-1.5-pro-exp-0801",
-        "gemini-1.5-pro-exp-0827",
-        "gemini-1.5-pro-latest",
-        "gemini-pro",
-        "gemini-pro-vision",
-    ],
-    "bedrock": [
-        "amazon.titan-tg1-large",
-        "amazon.titan-text-lite-v1",
-        "amazon.titan-text-express-v1",
-        "anthropic.claude-instant-v1",
-        "anthropic.claude-v2:1",
-        "anthropic.claude-v2",
-        "anthropic.claude-3-sonnet-20240229-v1:0",
-        "anthropic.claude-3-haiku-20240307-v1:0",
-        "anthropic.claude-3-opus-20240229-v1:0",
-        "anthropic.claude-3-5-sonnet-20240620-v1:0",
-        "cohere.command-text-v14",
-        "cohere.command-r-v1:0",
-        "cohere.command-r-plus-v1:0",
-        "cohere.command-light-text-v14",
-        "meta.llama3-8b-instruct-v1:0",
-        "meta.llama3-70b-instruct-v1:0",
-        "meta.llama3-1-8b-instruct-v1:0",
-        "meta.llama3-1-70b-instruct-v1:0",
-        "meta.llama3-1-405b-instruct-v1:0",
-        "mistral.mistral-7b-instruct-v0:2",
-        "mistral.mixtral-8x7b-instruct-v0:1",
-        "mistral.mistral-large-2402-v1:0",
-        "mistral.mistral-large-2407-v1:0",
-    ],
-}
+models_available = {
+    "openai": [
+        "gpt-3.5-turbo-1106",
+        "gpt-4-0125-preview",
+        "gpt-4-turbo-preview",
+        "gpt-3.5-turbo-16k",
+        "gpt-4-1106-preview",
+        "gpt-4-turbo-2024-04-09",
+        "gpt-3.5-turbo-16k-0613",
+        "gpt-4o-2024-05-13",
+        "gpt-4-turbo",
+        "gpt-3.5-turbo-0613",
+        "gpt-4",
+        "gpt-4-0613",
+        "gpt-3.5-turbo-0125",
+        "gpt-3.5-turbo",
+        "gpt-3.5-turbo-instruct",
+        "gpt-3.5-turbo-instruct-0914",
+        "gpt-3.5-turbo-0301",
+        "gpt-4-vision-preview",
+        "gpt-4-1106-vision-preview",
+        "gpt-4o",
+    ],
+    "anthropic": [
+        "claude-3-5-sonnet-20240620",
+        "claude-3-opus-20240229",
+        "claude-3-sonnet-20240229",
+        "claude-3-haiku-20240307",
+    ],
+    "deep_infra": [
+        "meta-llama/Llama-2-13b-chat-hf",
+        "mistralai/Mixtral-8x22B-Instruct-v0.1",
+        "Gryphe/MythoMax-L2-13b-turbo",
+        "mistralai/Mistral-7B-Instruct-v0.1",
+        "Austism/chronos-hermes-13b-v2",
+        "meta-llama/Llama-2-70b-chat-hf",
+        "mistralai/Mistral-7B-Instruct-v0.3",
+        "meta-llama/Llama-2-7b-chat-hf",
+        "Qwen/Qwen2-72B-Instruct",
+        "HuggingFaceH4/zephyr-orpo-141b-A35b-v0.1",
+        "cognitivecomputations/dolphin-2.6-mixtral-8x7b",
+        "bigcode/starcoder2-15b",
+        "microsoft/WizardLM-2-8x22B",
+        "codellama/CodeLlama-70b-Instruct-hf",
+        "Gryphe/MythoMax-L2-13b",
+        "microsoft/WizardLM-2-7B",
+        "01-ai/Yi-34B-Chat",
+        "bigcode/starcoder2-15b-instruct-v0.1",
+        "mistralai/Mixtral-8x7B-Instruct-v0.1",
+        "openchat/openchat-3.6-8b",
+        "meta-llama/Meta-Llama-3-8B-Instruct",
+        "microsoft/Phi-3-medium-4k-instruct",
+        "Phind/Phind-CodeLlama-34B-v2",
+        "google/codegemma-7b-it",
+        "mistralai/Mistral-7B-Instruct-v0.2",
+        "deepinfra/airoboros-70b",
+        "mistralai/Mixtral-8x22B-v0.1",
+        "llava-hf/llava-1.5-7b-hf",
+        "codellama/CodeLlama-34b-Instruct-hf",
+        "google/gemma-1.1-7b-it",
+        "lizpreciatior/lzlv_70b_fp16_hf",
+        "databricks/dbrx-instruct",
+        "nvidia/Nemotron-4-340B-Instruct",
+        "Qwen/Qwen2-7B-Instruct",
+        "meta-llama/Meta-Llama-3-70B-Instruct",
+        "openchat/openchat_3.5",
+    ],
+    "google": [
+        "gemini-1.0-pro",
+        "gemini-1.0-pro-001",
+        "gemini-1.0-pro-latest",
+        "gemini-1.0-pro-vision-latest",
+        "gemini-1.5-flash",
+        "gemini-1.5-flash-001",
+        "gemini-1.5-flash-001-tuning",
+        "gemini-1.5-flash-002",
+        "gemini-1.5-flash-8b",
+        "gemini-1.5-flash-8b-001",
+        "gemini-1.5-flash-8b-exp-0827",
+        "gemini-1.5-flash-8b-exp-0924",
+        "gemini-1.5-flash-8b-latest",
+        "gemini-1.5-flash-exp-0827",
+        "gemini-1.5-flash-latest",
+        "gemini-1.5-pro",
+        "gemini-1.5-pro-001",
+        "gemini-1.5-pro-002",
+        "gemini-1.5-pro-exp-0801",
+        "gemini-1.5-pro-exp-0827",
+        "gemini-1.5-pro-latest",
+        "gemini-pro",
+        "gemini-pro-vision",
+    ],
+    "bedrock": [
+        "amazon.titan-tg1-large",
+        "amazon.titan-text-lite-v1",
+        "amazon.titan-text-express-v1",
+        "anthropic.claude-instant-v1",
+        "anthropic.claude-v2:1",
+        "anthropic.claude-v2",
+        "anthropic.claude-3-sonnet-20240229-v1:0",
+        "anthropic.claude-3-haiku-20240307-v1:0",
+        "anthropic.claude-3-opus-20240229-v1:0",
+        "anthropic.claude-3-5-sonnet-20240620-v1:0",
+        "cohere.command-text-v14",
+        "cohere.command-r-v1:0",
+        "cohere.command-r-plus-v1:0",
+        "cohere.command-light-text-v14",
+        "meta.llama3-8b-instruct-v1:0",
+        "meta.llama3-70b-instruct-v1:0",
+        "meta.llama3-1-8b-instruct-v1:0",
+        "meta.llama3-1-70b-instruct-v1:0",
+        "meta.llama3-1-405b-instruct-v1:0",
+        "mistral.mistral-7b-instruct-v0:2",
+        "mistral.mixtral-8x7b-instruct-v0:1",
+        "mistral.mistral-large-2402-v1:0",
+        "mistral.mistral-large-2407-v1:0",
+    ],
+}

edsl/inference_services/rate_limits_cache.py

@@ -1,25 +1,25 @@
-rate_limits = {
-    "openai": {
-        "date": "Tue, 02 Jul 2024 15:25:28 GMT",
-        "content-type": "application/json",
-        "transfer-encoding": "chunked",
-        "connection": "keep-alive",
-        "openai-organization": "user-wmu32omw8ulzzutk6mjhtqgk",
-        "openai-processing-ms": "760",
-        "openai-version": "2020-10-01",
-        "strict-transport-security": "max-age=31536000; includeSubDomains",
-        "x-ratelimit-limit-requests": "5000",
-        "x-ratelimit-limit-tokens": "600000",
-        "x-ratelimit-remaining-requests": "4999",
-        "x-ratelimit-remaining-tokens": "599978",
-        "x-ratelimit-reset-requests": "12ms",
-        "x-ratelimit-reset-tokens": "2ms",
-        "x-request-id": "req_971608f3647f660a0cd6537fbe21f69c",
-        "cf-cache-status": "DYNAMIC",
-        "set-cookie": "__cf_bm=MJfUk.0TXdjtiNkUUqlUO2gaN3wzm0iHsRQRWExy52o-1719933928-1.0.1.1-0xk9gFxy_mD1KzAsKQ_HpL2pdQJ90D4B5frt65xU.c9k9QwD0oTBILqXB0rykXNh04Pm1UB1.H_W9sFJVOcSaw; path=/; expires=Tue, 02-Jul-24 15:55:28 GMT; domain=.api.openai.com; HttpOnly; Secure; SameSite=None, _cfuvid=GbheRct_iw9_I8iLWmt5ZRcLYZ_QVnroCrAt8QMVsUg-1719933928399-0.0.1.1-604800000; path=/; domain=.api.openai.com; HttpOnly; Secure; SameSite=None",
-        "server": "cloudflare",
-        "cf-ray": "89cfa6059bb9b68f-OTP",
-        "content-encoding": "gzip",
-        "alt-svc": 'h3=":443"; ma=86400',
-    }
-}
+rate_limits = {
+    "openai": {
+        "date": "Tue, 02 Jul 2024 15:25:28 GMT",
+        "content-type": "application/json",
+        "transfer-encoding": "chunked",
+        "connection": "keep-alive",
+        "openai-organization": "user-wmu32omw8ulzzutk6mjhtqgk",
+        "openai-processing-ms": "760",
+        "openai-version": "2020-10-01",
+        "strict-transport-security": "max-age=31536000; includeSubDomains",
+        "x-ratelimit-limit-requests": "5000",
+        "x-ratelimit-limit-tokens": "600000",
+        "x-ratelimit-remaining-requests": "4999",
+        "x-ratelimit-remaining-tokens": "599978",
+        "x-ratelimit-reset-requests": "12ms",
+        "x-ratelimit-reset-tokens": "2ms",
+        "x-request-id": "req_971608f3647f660a0cd6537fbe21f69c",
+        "cf-cache-status": "DYNAMIC",
+        "set-cookie": "__cf_bm=MJfUk.0TXdjtiNkUUqlUO2gaN3wzm0iHsRQRWExy52o-1719933928-1.0.1.1-0xk9gFxy_mD1KzAsKQ_HpL2pdQJ90D4B5frt65xU.c9k9QwD0oTBILqXB0rykXNh04Pm1UB1.H_W9sFJVOcSaw; path=/; expires=Tue, 02-Jul-24 15:55:28 GMT; domain=.api.openai.com; HttpOnly; Secure; SameSite=None, _cfuvid=GbheRct_iw9_I8iLWmt5ZRcLYZ_QVnroCrAt8QMVsUg-1719933928399-0.0.1.1-604800000; path=/; domain=.api.openai.com; HttpOnly; Secure; SameSite=None",
+        "server": "cloudflare",
+        "cf-ray": "89cfa6059bb9b68f-OTP",
+        "content-encoding": "gzip",
+        "alt-svc": 'h3=":443"; ma=86400',
+    }
+}

edsl/inference_services/registry.py

@@ -1,39 +1,41 @@
-from edsl.inference_services.InferenceServicesCollection import (
-    InferenceServicesCollection,
-)
-
-from edsl.inference_services.OpenAIService import OpenAIService
-from edsl.inference_services.AnthropicService import AnthropicService
-from edsl.inference_services.DeepInfraService import DeepInfraService
-from edsl.inference_services.GoogleService import GoogleService
-from edsl.inference_services.GroqService import GroqService
-from edsl.inference_services.AwsBedrock import AwsBedrockService
-from edsl.inference_services.AzureAI import AzureAIService
-from edsl.inference_services.OllamaService import OllamaService
-from edsl.inference_services.TestService import TestService
-from edsl.inference_services.TogetherAIService import TogetherAIService
-
-try:
-    from edsl.inference_services.MistralAIService import MistralAIService
-
-    mistral_available = True
-except Exception as e:
-    mistral_available = False
-
-services = [
-    OpenAIService,
-    AnthropicService,
-    DeepInfraService,
-    GoogleService,
-    GroqService,
-    AwsBedrockService,
-    AzureAIService,
-    OllamaService,
-    TestService,
-    TogetherAIService,
-]
-
-if mistral_available:
-    services.append(MistralAIService)
-
-default = InferenceServicesCollection(services)
+from edsl.inference_services.InferenceServicesCollection import (
+    InferenceServicesCollection,
+)
+
+from edsl.inference_services.OpenAIService import OpenAIService
+from edsl.inference_services.AnthropicService import AnthropicService
+from edsl.inference_services.DeepInfraService import DeepInfraService
+from edsl.inference_services.GoogleService import GoogleService
+from edsl.inference_services.GroqService import GroqService
+from edsl.inference_services.AwsBedrock import AwsBedrockService
+from edsl.inference_services.AzureAI import AzureAIService
+from edsl.inference_services.OllamaService import OllamaService
+from edsl.inference_services.TestService import TestService
+from edsl.inference_services.TogetherAIService import TogetherAIService
+from edsl.inference_services.PerplexityService import PerplexityService
+
+try:
+    from edsl.inference_services.MistralAIService import MistralAIService
+
+    mistral_available = True
+except Exception as e:
+    mistral_available = False
+
+services = [
+    OpenAIService,
+    AnthropicService,
+    DeepInfraService,
+    GoogleService,
+    GroqService,
+    AwsBedrockService,
+    AzureAIService,
+    OllamaService,
+    TestService,
+    TogetherAIService,
+    PerplexityService,
+]
+
+if mistral_available:
+    services.append(MistralAIService)
+
+default = InferenceServicesCollection(services)

edsl/inference_services/write_available.py

@@ -1,10 +1,10 @@
-from edsl.inference_services.registry import default
-
-
-def write_available():
-    d = {}
-    for service in default.services:
-        d[service._inference_service_] = service.available()
-
-    with open("models_available_cache.py", "w") as f:
-        f.write(f"models_available = {d}")
+from edsl.inference_services.registry import default
+
+
+def write_available():
+    d = {}
+    for service in default.services:
+        d[service._inference_service_] = service.available()
+
+    with open("models_available_cache.py", "w") as f:
+        f.write(f"models_available = {d}")