edsl 0.1.36.dev6__py3-none-any.whl → 0.1.37__py3-none-any.whl

edsl/language_models/ModelList.py

@@ -1,102 +1,102 @@
-from typing import Optional
-from collections import UserList
-from edsl import Model
-
-from edsl.language_models import LanguageModel
-from edsl.Base import Base
-from edsl.utilities.decorators import add_edsl_version, remove_edsl_version
-from edsl.utilities.utilities import is_valid_variable_name
-from edsl.utilities.utilities import dict_hash
-
-
-class ModelList(Base, UserList):
-    def __init__(self, data: Optional[list] = None):
-        """Initialize the ScenarioList class.
-
-        >>> from edsl import Model
-        >>> m = ModelList(Model.available())
-
-        """
-        if data is not None:
-            super().__init__(data)
-        else:
-            super().__init__([])
-
-    @property
-    def names(self):
-        """
-
-        >>> ModelList.example().names
-        {'...'}
-        """
-        return set([model.model for model in self])
-
-    def rich_print(self):
-        pass
-
-    def __repr__(self):
-        return f"ModelList({super().__repr__()})"
-
-    def __hash__(self):
-        """Return a hash of the ModelList. This is used for comparison of ModelLists.
-
-        >>> isinstance(hash(Model()), int)
-        True
-
-        """
-        from edsl.utilities.utilities import dict_hash
-
-        return dict_hash(self._to_dict(sort=True))
-
-    def _to_dict(self, sort=False):
-        if sort:
-            model_list = sorted([model for model in self], key=lambda x: hash(x))
-            return {"models": [model._to_dict() for model in model_list]}
-        else:
-            return {"models": [model._to_dict() for model in self]}
-
-    @classmethod
-    def from_names(self, *args, **kwargs):
-        """A a model list from a list of names"""
-        if len(args) == 1 and isinstance(args[0], list):
-            args = args[0]
-        return ModelList([Model(model_name, **kwargs) for model_name in args])
-
-    @add_edsl_version
-    def to_dict(self):
-        """
-        Convert the ModelList to a dictionary.
-        >>> ModelList.example().to_dict()
-        {'models': [...], 'edsl_version': '...', 'edsl_class_name': 'ModelList'}
-        """
-        return self._to_dict()
-
-    @classmethod
-    @remove_edsl_version
-    def from_dict(cls, data):
-        """
-        Create a ModelList from a dictionary.
-
-        >>> newm = ModelList.from_dict(ModelList.example().to_dict())
-        >>> assert ModelList.example() == newm
-        """
-        return cls(data=[LanguageModel.from_dict(model) for model in data["models"]])
-
-    def code(self):
-        pass
-
-    @classmethod
-    def example(cls, randomize: bool = False) -> "ModelList":
-        """
-        Returns an example ModelList instance.
-
-        :param randomize: If True, uses Model's randomize method.
-        """
-
-        return cls([Model.example(randomize) for _ in range(3)])
-
-
-if __name__ == "__main__":
-    import doctest
-
-    doctest.testmod(optionflags=doctest.ELLIPSIS)
+from typing import Optional
+from collections import UserList
+from edsl import Model
+
+from edsl.language_models import LanguageModel
+from edsl.Base import Base
+from edsl.utilities.decorators import add_edsl_version, remove_edsl_version
+from edsl.utilities.utilities import is_valid_variable_name
+from edsl.utilities.utilities import dict_hash
+
+
+class ModelList(Base, UserList):
+    def __init__(self, data: Optional[list] = None):
+        """Initialize the ScenarioList class.
+
+        >>> from edsl import Model
+        >>> m = ModelList(Model.available())
+
+        """
+        if data is not None:
+            super().__init__(data)
+        else:
+            super().__init__([])
+
+    @property
+    def names(self):
+        """
+
+        >>> ModelList.example().names
+        {'...'}
+        """
+        return set([model.model for model in self])
+
+    def rich_print(self):
+        pass
+
+    def __repr__(self):
+        return f"ModelList({super().__repr__()})"
+
+    def __hash__(self):
+        """Return a hash of the ModelList. This is used for comparison of ModelLists.
+
+        >>> isinstance(hash(Model()), int)
+        True
+
+        """
+        from edsl.utilities.utilities import dict_hash
+
+        return dict_hash(self._to_dict(sort=True))
+
+    def _to_dict(self, sort=False):
+        if sort:
+            model_list = sorted([model for model in self], key=lambda x: hash(x))
+            return {"models": [model._to_dict() for model in model_list]}
+        else:
+            return {"models": [model._to_dict() for model in self]}
+
+    @classmethod
+    def from_names(self, *args, **kwargs):
+        """A a model list from a list of names"""
+        if len(args) == 1 and isinstance(args[0], list):
+            args = args[0]
+        return ModelList([Model(model_name, **kwargs) for model_name in args])
+
+    @add_edsl_version
+    def to_dict(self):
+        """
+        Convert the ModelList to a dictionary.
+        >>> ModelList.example().to_dict()
+        {'models': [...], 'edsl_version': '...', 'edsl_class_name': 'ModelList'}
+        """
+        return self._to_dict()
+
+    @classmethod
+    @remove_edsl_version
+    def from_dict(cls, data):
+        """
+        Create a ModelList from a dictionary.
+
+        >>> newm = ModelList.from_dict(ModelList.example().to_dict())
+        >>> assert ModelList.example() == newm
+        """
+        return cls(data=[LanguageModel.from_dict(model) for model in data["models"]])
+
+    def code(self):
+        pass
+
+    @classmethod
+    def example(cls, randomize: bool = False) -> "ModelList":
+        """
+        Returns an example ModelList instance.
+
+        :param randomize: If True, uses Model's randomize method.
+        """
+
+        return cls([Model.example(randomize) for _ in range(3)])
+
+
+if __name__ == "__main__":
+    import doctest
+
+    doctest.testmod(optionflags=doctest.ELLIPSIS)

edsl/language_models/RegisterLanguageModelsMeta.py

@@ -1,184 +1,184 @@
-from abc import ABC, ABCMeta
-from typing import Any, List, Callable
-import inspect
-from typing import get_type_hints
-from edsl.exceptions.language_models import LanguageModelAttributeTypeError
-from edsl.enums import InferenceServiceType
-
-
-class RegisterLanguageModelsMeta(ABCMeta):
-    """Metaclass to register output elements in a registry i.e., those that have a parent."""
-
-    _registry = {}  # Initialize the registry as a dictionary
-    REQUIRED_CLASS_ATTRIBUTES = ["_model_", "_parameters_", "_inference_service_"]
-
-    def __init__(cls, name, bases, dct):
-        """Register the class in the registry if it has a _model_ attribute."""
-        super(RegisterLanguageModelsMeta, cls).__init__(name, bases, dct)
-        # if name != "LanguageModel":
-        if (model_name := getattr(cls, "_model_", None)) is not None:
-            RegisterLanguageModelsMeta.check_required_class_variables(
-                cls, RegisterLanguageModelsMeta.REQUIRED_CLASS_ATTRIBUTES
-            )
-
-            ## Check that model name is valid
-            # if not LanguageModelType.is_value_valid(model_name):
-            #     acceptable_values = [item.value for item in LanguageModelType]
-            #     raise LanguageModelAttributeTypeError(
-            #         f"""A LanguageModel's model must be one of {LanguageModelType} values, which are
-            #         {acceptable_values}. You passed {model_name}."""
-            #     )
-
-            if not InferenceServiceType.is_value_valid(
-                inference_service := getattr(cls, "_inference_service_", None)
-            ):
-                acceptable_values = [item.value for item in InferenceServiceType]
-                raise LanguageModelAttributeTypeError(
-                    f"""A LanguageModel's model must have an _inference_service_ value from 
-                    {acceptable_values}. You passed {inference_service}."""
-                )
-
-            # LanguageModel children have to implement the async_execute_model_call method
-            RegisterLanguageModelsMeta.verify_method(
-                candidate_class=cls,
-                method_name="async_execute_model_call",
-                expected_return_type=dict[str, Any],
-                required_parameters=[("user_prompt", str), ("system_prompt", str)],
-                must_be_async=True,
-            )
-            # LanguageModel children have to implement the parse_response method
-            RegisterLanguageModelsMeta._registry[model_name] = cls
-
-    @classmethod
-    def get_registered_classes(cls):
-        """Return the registry."""
-        return cls._registry
-
-    @staticmethod
-    def check_required_class_variables(
-        candidate_class: "LanguageModel", required_attributes: List[str] = None
-    ):
-        """Check if a class has the required attributes.
-
-        >>> class M:
-        ...     _model_ = "m"
-        ...     _parameters_ = {}
-        >>> RegisterLanguageModelsMeta.check_required_class_variables(M, ["_model_", "_parameters_"])
-        >>> class M2:
-        ...     _model_ = "m"
-        >>> RegisterLanguageModelsMeta.check_required_class_variables(M2, ["_model_", "_parameters_"])
-        Traceback (most recent call last):
-        ...
-        Exception: Class M2 does not have required attribute _parameters_
-        """
-        required_attributes = required_attributes or []
-        for attribute in required_attributes:
-            if not hasattr(candidate_class, attribute):
-                raise Exception(
-                    f"Class {candidate_class.__name__} does not have required attribute {attribute}"
-                )
-
-    @staticmethod
-    def verify_method(
-        candidate_class: "LanguageModel",
-        method_name: str,
-        expected_return_type: Any,
-        required_parameters: List[tuple[str, Any]] = None,
-        must_be_async: bool = False,
-    ):
-        """Verify that a method is defined in a class, has the correct return type, and has the correct parameters."""
-        RegisterLanguageModelsMeta._check_method_defined(candidate_class, method_name)
-
-        required_parameters = required_parameters or []
-        method = getattr(candidate_class, method_name)
-        # signature = inspect.signature(method)
-
-        RegisterLanguageModelsMeta._check_return_type(method, expected_return_type)
-
-        if must_be_async:
-            RegisterLanguageModelsMeta._check_is_coroutine(method)
-
-        # Check the parameters
-        # params = signature.parameters
-        # for param_name, param_type in required_parameters:
-        #     RegisterLanguageModelsMeta._verify_parameter(
-        #         params, param_name, param_type, method_name
-        #     )
-
-    @staticmethod
-    def _check_method_defined(cls, method_name):
-        """Check if a method is defined in a class.
-
-        Example:
-        >>> class M:
-        ...     def f(self): pass
-        >>> RegisterLanguageModelsMeta._check_method_defined(M, "f")
-        >>> RegisterLanguageModelsMeta._check_method_defined(M, "g")
-        Traceback (most recent call last):
-        ...
-        NotImplementedError: g method must be implemented.
-        """
-        if not hasattr(cls, method_name):
-            raise NotImplementedError(f"{method_name} method must be implemented.")
-
-    @staticmethod
-    def _check_is_coroutine(func: Callable):
-        """Check to make sure it's a coroutine function.
-
-        Example:
-
-        >>> def f(): pass
-        >>> RegisterLanguageModelsMeta._check_is_coroutine(f)
-        Traceback (most recent call last):
-        ...
-        TypeError: A LangugeModel class with method f must be an asynchronous method.
-        """
-        if not inspect.iscoroutinefunction(func):
-            raise TypeError(
-                f"A LangugeModel class with method {func.__name__} must be an asynchronous method."
-            )
-
-    @staticmethod
-    def _verify_parameter(params, param_name, param_type, method_name):
-        """Verify that a parameter is defined in a method and has the correct type."""
-        pass
-        # if param_name not in params:
-        #     raise TypeError(
-        #         f"""Parameter "{param_name}" of method "{method_name}" must be defined.
-        #         """
-        #     )
-        # if params[param_name].annotation != param_type:
-        #     raise TypeError(
-        #         f"""Parameter "{param_name}" of method "{method_name}" must be of type {param_type.__name__}.
-        #         Got {params[param_name].annotation} instead.
-        #         """
-        #     )
-
-    @staticmethod
-    def _check_return_type(method, expected_return_type):
-        """
-        Check if the return type of a method is as expected.
-
-        Example:
-        """
-        pass
-        # if inspect.isroutine(method):
-        #     # return_type = inspect.signature(method).return_annotation
-        #     return_type = get_type_hints(method)["return"]
-        #     if return_type != expected_return_type:
-        #         raise TypeError(
-        #             f"Return type of {method.__name__} must be {expected_return_type}. Got {return_type}."
-        #         )
-
-    @classmethod
-    def model_names_to_classes(cls):
-        """Return a dictionary of model names to classes."""
-        d = {}
-        for classname, cls in cls._registry.items():
-            if hasattr(cls, "_model_"):
-                d[cls._model_] = cls
-            else:
-                raise Exception(
-                    f"Class {classname} does not have a _model_ class attribute."
-                )
-        return d
+from abc import ABC, ABCMeta
+from typing import Any, List, Callable
+import inspect
+from typing import get_type_hints
+from edsl.exceptions.language_models import LanguageModelAttributeTypeError
+from edsl.enums import InferenceServiceType
+
+
+class RegisterLanguageModelsMeta(ABCMeta):
+    """Metaclass to register output elements in a registry i.e., those that have a parent."""
+
+    _registry = {}  # Initialize the registry as a dictionary
+    REQUIRED_CLASS_ATTRIBUTES = ["_model_", "_parameters_", "_inference_service_"]
+
+    def __init__(cls, name, bases, dct):
+        """Register the class in the registry if it has a _model_ attribute."""
+        super(RegisterLanguageModelsMeta, cls).__init__(name, bases, dct)
+        # if name != "LanguageModel":
+        if (model_name := getattr(cls, "_model_", None)) is not None:
+            RegisterLanguageModelsMeta.check_required_class_variables(
+                cls, RegisterLanguageModelsMeta.REQUIRED_CLASS_ATTRIBUTES
+            )
+
+            ## Check that model name is valid
+            # if not LanguageModelType.is_value_valid(model_name):
+            #     acceptable_values = [item.value for item in LanguageModelType]
+            #     raise LanguageModelAttributeTypeError(
+            #         f"""A LanguageModel's model must be one of {LanguageModelType} values, which are
+            #         {acceptable_values}. You passed {model_name}."""
+            #     )
+
+            if not InferenceServiceType.is_value_valid(
+                inference_service := getattr(cls, "_inference_service_", None)
+            ):
+                acceptable_values = [item.value for item in InferenceServiceType]
+                raise LanguageModelAttributeTypeError(
+                    f"""A LanguageModel's model must have an _inference_service_ value from 
+                    {acceptable_values}. You passed {inference_service}."""
+                )
+
+            # LanguageModel children have to implement the async_execute_model_call method
+            RegisterLanguageModelsMeta.verify_method(
+                candidate_class=cls,
+                method_name="async_execute_model_call",
+                expected_return_type=dict[str, Any],
+                required_parameters=[("user_prompt", str), ("system_prompt", str)],
+                must_be_async=True,
+            )
+            # LanguageModel children have to implement the parse_response method
+            RegisterLanguageModelsMeta._registry[model_name] = cls
+
+    @classmethod
+    def get_registered_classes(cls):
+        """Return the registry."""
+        return cls._registry
+
+    @staticmethod
+    def check_required_class_variables(
+        candidate_class: "LanguageModel", required_attributes: List[str] = None
+    ):
+        """Check if a class has the required attributes.
+
+        >>> class M:
+        ...     _model_ = "m"
+        ...     _parameters_ = {}
+        >>> RegisterLanguageModelsMeta.check_required_class_variables(M, ["_model_", "_parameters_"])
+        >>> class M2:
+        ...     _model_ = "m"
+        >>> RegisterLanguageModelsMeta.check_required_class_variables(M2, ["_model_", "_parameters_"])
+        Traceback (most recent call last):
+        ...
+        Exception: Class M2 does not have required attribute _parameters_
+        """
+        required_attributes = required_attributes or []
+        for attribute in required_attributes:
+            if not hasattr(candidate_class, attribute):
+                raise Exception(
+                    f"Class {candidate_class.__name__} does not have required attribute {attribute}"
+                )
+
+    @staticmethod
+    def verify_method(
+        candidate_class: "LanguageModel",
+        method_name: str,
+        expected_return_type: Any,
+        required_parameters: List[tuple[str, Any]] = None,
+        must_be_async: bool = False,
+    ):
+        """Verify that a method is defined in a class, has the correct return type, and has the correct parameters."""
+        RegisterLanguageModelsMeta._check_method_defined(candidate_class, method_name)
+
+        required_parameters = required_parameters or []
+        method = getattr(candidate_class, method_name)
+        # signature = inspect.signature(method)
+
+        RegisterLanguageModelsMeta._check_return_type(method, expected_return_type)
+
+        if must_be_async:
+            RegisterLanguageModelsMeta._check_is_coroutine(method)
+
+        # Check the parameters
+        # params = signature.parameters
+        # for param_name, param_type in required_parameters:
+        #     RegisterLanguageModelsMeta._verify_parameter(
+        #         params, param_name, param_type, method_name
+        #     )
+
+    @staticmethod
+    def _check_method_defined(cls, method_name):
+        """Check if a method is defined in a class.
+
+        Example:
+        >>> class M:
+        ...     def f(self): pass
+        >>> RegisterLanguageModelsMeta._check_method_defined(M, "f")
+        >>> RegisterLanguageModelsMeta._check_method_defined(M, "g")
+        Traceback (most recent call last):
+        ...
+        NotImplementedError: g method must be implemented.
+        """
+        if not hasattr(cls, method_name):
+            raise NotImplementedError(f"{method_name} method must be implemented.")
+
+    @staticmethod
+    def _check_is_coroutine(func: Callable):
+        """Check to make sure it's a coroutine function.
+
+        Example:
+
+        >>> def f(): pass
+        >>> RegisterLanguageModelsMeta._check_is_coroutine(f)
+        Traceback (most recent call last):
+        ...
+        TypeError: A LangugeModel class with method f must be an asynchronous method.
+        """
+        if not inspect.iscoroutinefunction(func):
+            raise TypeError(
+                f"A LangugeModel class with method {func.__name__} must be an asynchronous method."
+            )
+
+    @staticmethod
+    def _verify_parameter(params, param_name, param_type, method_name):
+        """Verify that a parameter is defined in a method and has the correct type."""
+        pass
+        # if param_name not in params:
+        #     raise TypeError(
+        #         f"""Parameter "{param_name}" of method "{method_name}" must be defined.
+        #         """
+        #     )
+        # if params[param_name].annotation != param_type:
+        #     raise TypeError(
+        #         f"""Parameter "{param_name}" of method "{method_name}" must be of type {param_type.__name__}.
+        #         Got {params[param_name].annotation} instead.
+        #         """
+        #     )
+
+    @staticmethod
+    def _check_return_type(method, expected_return_type):
+        """
+        Check if the return type of a method is as expected.
+
+        Example:
+        """
+        pass
+        # if inspect.isroutine(method):
+        #     # return_type = inspect.signature(method).return_annotation
+        #     return_type = get_type_hints(method)["return"]
+        #     if return_type != expected_return_type:
+        #         raise TypeError(
+        #             f"Return type of {method.__name__} must be {expected_return_type}. Got {return_type}."
+        #         )
+
+    @classmethod
+    def model_names_to_classes(cls):
+        """Return a dictionary of model names to classes."""
+        d = {}
+        for classname, cls in cls._registry.items():
+            if hasattr(cls, "_model_"):
+                d[cls._model_] = cls
+            else:
+                raise Exception(
+                    f"Class {classname} does not have a _model_ class attribute."
+                )
+        return d

edsl/language_models/__init__.py

@@ -1,2 +1,3 @@
-from edsl.language_models.LanguageModel import LanguageModel
-from edsl.language_models.registry import Model
+from edsl.language_models.LanguageModel import LanguageModel
+from edsl.language_models.registry import Model
+from edsl.language_models.KeyLookup import KeyLookup

edsl/language_models/fake_openai_call.py

@@ -1,15 +1,15 @@
-from openai import AsyncOpenAI
-import asyncio
-
-client = AsyncOpenAI(base_url="http://127.0.0.1:8000/v1", api_key="fake_key")
-
-
-async def main():
-    response = await client.chat.completions.create(
-        model="gpt-3.5-turbo", messages=[{"role": "user", "content": "Question XX42"}]
-    )
-    print(response)
-
-
-if __name__ == "__main__":
-    asyncio.run(main())
+from openai import AsyncOpenAI
+import asyncio
+
+client = AsyncOpenAI(base_url="http://127.0.0.1:8000/v1", api_key="fake_key")
+
+
+async def main():
+    response = await client.chat.completions.create(
+        model="gpt-3.5-turbo", messages=[{"role": "user", "content": "Question XX42"}]
+    )
+    print(response)
+
+
+if __name__ == "__main__":
+    asyncio.run(main())