edsl 0.1.47__py3-none-any.whl → 0.1.49__py3-none-any.whl

edsl/inference_services/{AvailableModelFetcher.py → available_model_fetcher.py}

@@ -2,19 +2,13 @@ from typing import Any, List, Tuple, Optional, Dict, TYPE_CHECKING, Union, Gener
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from collections import UserList
 
-from edsl.inference_services.ServiceAvailability import ServiceAvailability
-from edsl.inference_services.InferenceServiceABC import InferenceServiceABC
-from edsl.inference_services.data_structures import ModelNamesList
-from edsl.enums import InferenceServiceLiteral
+from .service_availability import ServiceAvailability
+from .inference_service_abc import InferenceServiceABC
+from ..enums import InferenceServiceLiteral
 
-from edsl.inference_services.data_structures import LanguageModelInfo
-from edsl.inference_services.AvailableModelCacheHandler import (
-    AvailableModelCacheHandler,
-)
-
-
-from edsl.inference_services.data_structures import AvailableModels
+from .data_structures import ModelNamesList, LanguageModelInfo, AvailableModels
 
+from .available_model_cache_handler import AvailableModelCacheHandler
 
 class AvailableModelFetcher:
     """Fetches available models from the various services with JSON caching."""
@@ -62,7 +56,7 @@ class AvailableModelFetcher:
 
         :param service: Optional[InferenceServiceABC] - If specified, only fetch models for this service.
 
-        >>> from edsl.inference_services.OpenAIService import OpenAIService
+        >>> from edsl.inference_services.services.open_ai_service import OpenAIService
         >>> af = AvailableModelFetcher([OpenAIService()], {})
         >>> af.available(service="openai")
         [LanguageModelInfo(model_name='...', service_name='openai'), ...]
@@ -195,7 +189,7 @@ class AvailableModelFetcher:
 
 
 def main():
-    from edsl.inference_services.OpenAIService import OpenAIService
+    from .services.open_ai_service import OpenAIService
 
     af = AvailableModelFetcher([OpenAIService()], {}, verbose=True)
     # print(af.available(service="openai"))
@@ -211,7 +205,7 @@ if __name__ == "__main__":
     doctest.testmod(optionflags=doctest.ELLIPSIS)
     # main()
 
-    # from edsl.inference_services.OpenAIService import OpenAIService
+    # from .services.open_ai_service import OpenAIService
 
     # af = AvailableModelFetcher([OpenAIService()], {}, verbose=True)
     # # print(af.available(service="openai"))

edsl/inference_services/data_structures.py

@@ -1,8 +1,9 @@
 from collections import UserDict, defaultdict, UserList
 from typing import Union, Optional, List
-from edsl.enums import InferenceServiceLiteral
 from dataclasses import dataclass
 
+from ..enums import InferenceServiceLiteral
+from ..scenarios import ScenarioList
 
 @dataclass
 class LanguageModelInfo:
@@ -81,7 +82,7 @@ class AvailableModels(UserList):
         )
 
     def to_model_list(self):
-        from edsl.language_models.ModelList import ModelList
+        from ..language_models import ModelList
 
         return ModelList.from_available_models(self)
 

edsl/{exceptions/inference_services.py → inference_services/exceptions.py}

@@ -1,4 +1,4 @@
-from edsl.exceptions.BaseException import BaseException
+from ..base import BaseException
 
 
 class InferenceServiceError(BaseException):

edsl/inference_services/{InferenceServiceABC.py → inference_service_abc.py}

@@ -1,7 +1,7 @@
 from abc import abstractmethod, ABC
 import re
 from datetime import datetime, timedelta
-from edsl.config import CONFIG
+from ..config import CONFIG
 
 
 class InferenceServiceABC(ABC):

edsl/inference_services/{InferenceServicesCollection.py → inference_services_collection.py}

@@ -1,14 +1,15 @@
 from functools import lru_cache
 from collections import defaultdict
-from typing import Optional, Protocol, Dict, List, Tuple, TYPE_CHECKING, Literal
+from typing import Optional, Protocol, Dict, List, Tuple, TYPE_CHECKING, Literal, Type, TypeVar, Union
+import os
 
-from edsl.inference_services.InferenceServiceABC import InferenceServiceABC
-from edsl.inference_services.AvailableModelFetcher import AvailableModelFetcher
-from edsl.exceptions.inference_services import InferenceServiceError
+from .inference_service_abc import InferenceServiceABC
+from .available_model_fetcher import AvailableModelFetcher
+from .exceptions import InferenceServiceError
 
 if TYPE_CHECKING:
-    from edsl.language_models.LanguageModel import LanguageModel
-    from edsl.inference_services.InferenceServiceABC import InferenceServiceABC
+    from ..language_models import LanguageModel
+    from .inference_service_abc import InferenceServiceABC
 
 
 class ModelCreator(Protocol):
@@ -47,7 +48,7 @@ class ModelResolver:
 
         """
         if model_name == "test":
-            from edsl.inference_services.TestService import TestService
+            from .services.test_service import TestService
 
             return TestService()
 

edsl/inference_services/registry.py

@@ -1,45 +1,8 @@
-from edsl.inference_services.InferenceServicesCollection import (
-    InferenceServicesCollection,
-)
+from .inference_services_collection 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
-from edsl.inference_services.DeepSeekService import DeepSeekService
-from edsl.inference_services.XAIService import XAIService
+from .services import *
+from .services import __all__
 
-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,
-    DeepSeekService,
-    XAIService,
-]
-
-if mistral_available:
-    services.append(MistralAIService)
+services = [globals()[service_name] for service_name in __all__ if service_name in globals()]
 
 default = InferenceServicesCollection(services)

edsl/inference_services/{ServiceAvailability.py → service_availability.py}

@@ -3,10 +3,11 @@ from typing import List, Optional, TYPE_CHECKING
 from functools import partial
 import warnings
 
-from edsl.inference_services.data_structures import AvailableModels, ModelNamesList
+from .data_structures import AvailableModels, ModelNamesList
+from .inference_service_abc import InferenceServiceABC
 
 if TYPE_CHECKING:
-    from edsl.inference_services.InferenceServiceABC import InferenceServiceABC
+    from .inference_service_abc import InferenceServiceABC
 
 
 class ModelSource(Enum):
@@ -110,26 +111,5 @@ class ServiceAvailability:
 
 
 if __name__ == "__main__":
-    # sa = ServiceAvailability()
-    # models_from_coop = sa.models_from_coop()
-    # print(models_from_coop)
-    from edsl.inference_services.OpenAIService import OpenAIService
-
-    openai_models = ServiceAvailability._fetch_from_local_service(OpenAIService())
-    print(openai_models)
-
-# Example usage:
-"""
-# Default order (LOCAL -> COOP -> CACHE)
-availability = ServiceAvailability()
-
-# Custom order (COOP -> LOCAL -> CACHE)
-availability_coop_first = ServiceAvailability([
-    ModelSource.COOP,
-    ModelSource.LOCAL,
-    ModelSource.CACHE
-])
-
-# Get available models using custom order
-models = availability_coop_first.get_service_available(service, warn=True)
-"""
+    import doctest 
+    doctest.tesmod()

edsl/inference_services/services/__init__.py

@@ -0,0 +1,31 @@
+from .anthropic_service import AnthropicService
+from .aws_bedrock import AwsBedrockService
+from .azure_ai import AzureAIService
+from .deep_infra_service import DeepInfraService
+from .deep_seek_service import DeepSeekService
+from .google_service import GoogleService
+from .groq_service import GroqService
+from .mistral_ai_service import MistralAIService
+from .ollama_service import OllamaService
+from .open_ai_service import OpenAIService
+from .perplexity_service import PerplexityService
+from .test_service import TestService
+from .together_ai_service import TogetherAIService
+from .xai_service import XAIService
+
+__all__ = [
+    "AnthropicService",
+    "AwsBedrockService",
+    "AzureAIService",
+    "DeepInfraService",
+    "DeepSeekService",
+    "GoogleService",
+    "GroqService",
+    "MistralAIService",
+    "OllamaService",
+    "OpenAIService",
+    "PerplexityService",
+    "TestService",
+    "TogetherAIService",
+    "XAIService",
+] 

edsl/inference_services/{AnthropicService.py → services/anthropic_service.py}

@@ -1,9 +1,9 @@
 import os
 from typing import Any, Optional, List
-import re
 from anthropic import AsyncAnthropic
-from edsl.inference_services.InferenceServiceABC import InferenceServiceABC
-from edsl.language_models.LanguageModel import LanguageModel
+
+from ..inference_service_abc import InferenceServiceABC
+from ...language_models import LanguageModel
 
 
 class AnthropicService(InferenceServiceABC):

edsl/inference_services/{AwsBedrock.py → services/aws_bedrock.py}

@@ -3,8 +3,8 @@ from typing import Any, List, Optional
 import re
 import boto3
 from botocore.exceptions import ClientError
-from edsl.inference_services.InferenceServiceABC import InferenceServiceABC
-from edsl.language_models.LanguageModel import LanguageModel
+from ..inference_service_abc import InferenceServiceABC
+from ...language_models import LanguageModel
 import json
 from edsl.utilities.utilities import fix_partial_correct_response
 

edsl/inference_services/{AzureAI.py → services/azure_ai.py}

@@ -2,8 +2,8 @@ import os
 from typing import Any, Optional, List
 import re
 from openai import AsyncAzureOpenAI
-from edsl.inference_services.InferenceServiceABC import InferenceServiceABC
-from edsl.language_models.LanguageModel import LanguageModel
+from ..inference_service_abc import InferenceServiceABC
+from ...language_models import LanguageModel
 
 from azure.ai.inference.aio import ChatCompletionsClient
 from azure.core.credentials import AzureKeyCredential

edsl/inference_services/{DeepInfraService.py → services/deep_infra_service.py}

@@ -3,10 +3,8 @@ import json
 import requests
 from typing import Any, List
 
-# from edsl.inference_services.InferenceServiceABC import InferenceServiceABC
-from edsl.language_models import LanguageModel
 
-from edsl.inference_services.OpenAIService import OpenAIService
+from .open_ai_service import OpenAIService
 
 
 class DeepInfraService(OpenAIService):

edsl/inference_services/{DeepSeekService.py → services/deep_seek_service.py}

@@ -3,10 +3,8 @@ import json
 import requests
 from typing import Any, List
 
-# from edsl.inference_services.InferenceServiceABC import InferenceServiceABC
-from edsl.language_models import LanguageModel
-
-from edsl.inference_services.OpenAIService import OpenAIService
+from ...language_models import LanguageModel
+from .open_ai_service import OpenAIService
 
 
 class DeepSeekService(OpenAIService):

edsl/inference_services/{GoogleService.py → services/google_service.py}

@@ -6,9 +6,8 @@ from google.generativeai.types import GenerationConfig
 from google.api_core.exceptions import InvalidArgument
 
 # from edsl.exceptions.general import MissingAPIKeyError
-from edsl.language_models.LanguageModel import LanguageModel
-from edsl.inference_services.InferenceServiceABC import InferenceServiceABC
-from edsl.coop import Coop
+from ..inference_service_abc import InferenceServiceABC
+#from ...coop import Coop
 
 safety_settings = [
     {
@@ -58,10 +57,12 @@ class GoogleService(InferenceServiceABC):
     @classmethod
     def create_model(
         cls, model_name: str = "gemini-pro", model_class_name=None
-    ) -> LanguageModel:
+    ) -> 'LanguageModel':
         if model_class_name is None:
             model_class_name = cls.to_class_name(model_name)
 
+        from ...language_models import LanguageModel
+
         class LLM(LanguageModel):
             _model_ = model_name
             key_sequence = cls.key_sequence

edsl/inference_services/{GroqService.py → services/groq_service.py}

@@ -1,8 +1,8 @@
 from typing import Any, List
-from edsl.inference_services.OpenAIService import OpenAIService
 
 import groq
 
+from .open_ai_service import OpenAIService
 
 class GroqService(OpenAIService):
     """DeepInfra service class."""

edsl/inference_services/{MistralAIService.py → services/mistral_ai_service.py}

@@ -1,11 +1,11 @@
 import os
 from typing import Any, List, Optional
-from edsl.inference_services.InferenceServiceABC import InferenceServiceABC
-from edsl.language_models.LanguageModel import LanguageModel
 import asyncio
 from mistralai import Mistral
 
-from edsl.exceptions.language_models import LanguageModelBadResponseError
+
+from ..inference_service_abc import InferenceServiceABC
+from ...language_models import LanguageModel
 
 
 class MistralAIService(InferenceServiceABC):

edsl/inference_services/{OllamaService.py → services/ollama_service.py}

@@ -1,12 +1,6 @@
-import aiohttp
-import json
-import requests
 from typing import Any, List
 
-# from edsl.inference_services.InferenceServiceABC import InferenceServiceABC
-from edsl.language_models import LanguageModel
-
-from edsl.inference_services.OpenAIService import OpenAIService
+from .open_ai_service import OpenAIService
 
 
 class OllamaService(OpenAIService):

edsl/inference_services/{OpenAIService.py → services/open_ai_service.py}

@@ -2,15 +2,14 @@ from __future__ import annotations
 from typing import Any, List, Optional, Dict, NewType
 import os
 
-
 import openai
 
-from edsl.inference_services.InferenceServiceABC import InferenceServiceABC
-from edsl.language_models.LanguageModel import LanguageModel
-from edsl.inference_services.rate_limits_cache import rate_limits
-from edsl.utilities.utilities import fix_partial_correct_response
+from ..inference_service_abc import InferenceServiceABC
+from ...language_models import LanguageModel
+from ..rate_limits_cache import rate_limits
+from ...utilities.utilities import fix_partial_correct_response
 
-from edsl.config import CONFIG
+from ...config import CONFIG
 
 APIToken = NewType("APIToken", str)
 

edsl/inference_services/{PerplexityService.py → services/perplexity_service.py}

@@ -1,13 +1,9 @@
-import aiohttp
-import json
-import requests
 from typing import Any, List, Optional
-from edsl.inference_services.rate_limits_cache import rate_limits
+from ..rate_limits_cache import rate_limits
 
-# from edsl.inference_services.InferenceServiceABC import InferenceServiceABC
-from edsl.language_models import LanguageModel
+from ...language_models import LanguageModel
 
-from edsl.inference_services.OpenAIService import OpenAIService
+from .open_ai_service import OpenAIService
 
 
 class PerplexityService(OpenAIService):

edsl/inference_services/{TestService.py → services/test_service.py}

@@ -1,14 +1,15 @@
 from typing import Any, List, Optional
 import os
 import asyncio
-from edsl.inference_services.InferenceServiceABC import InferenceServiceABC
-from edsl.language_models.LanguageModel import LanguageModel
-from edsl.inference_services.rate_limits_cache import rate_limits
-from edsl.utilities.utilities import fix_partial_correct_response
-
-from edsl.enums import InferenceServiceType
 import random
 
+from ..inference_service_abc import InferenceServiceABC
+from ..rate_limits_cache import rate_limits
+
+from ...language_models import LanguageModel
+from ...utilities.utilities import fix_partial_correct_response
+from ...enums import InferenceServiceType
+
 
 class TestService(InferenceServiceABC):
     """OpenAI service class."""

edsl/inference_services/{TogetherAIService.py → services/together_ai_service.py}

@@ -1,12 +1,8 @@
-import aiohttp
-import json
-import requests
 from typing import Any, List, Optional
 
-# from edsl.inference_services.InferenceServiceABC import InferenceServiceABC
-from edsl.language_models import LanguageModel
+from ...language_models import LanguageModel
+from .open_ai_service import OpenAIService
 
-from edsl.inference_services.OpenAIService import OpenAIService
 import openai
 
 

edsl/inference_services/{XAIService.py → services/xai_service.py}

@@ -1,6 +1,6 @@
 from typing import Any, List
-from edsl.inference_services.OpenAIService import OpenAIService
 
+from .open_ai_service import OpenAIService
 
 class XAIService(OpenAIService):
     """Openai service class."""

edsl/inference_services/write_available.py

@@ -1,5 +1,4 @@
-from edsl.inference_services.registry import default
-
+from .registry import default
 
 def write_available():
     d = {}

edsl/instructions/__init__.py

@@ -0,0 +1,6 @@
+from .instruction import Instruction
+from .instruction_collection import InstructionCollection
+from .change_instruction import ChangeInstruction
+from .instruction_handler import InstructionHandler
+
+__all__ = ["Instruction", "ChangeInstruction"]

edsl/{surveys/instructions/Instruction.py → instructions/instruction.py}

@@ -1,6 +1,7 @@
 from typing import Union, Optional, List, Generator, Dict
-from edsl.utilities.remove_edsl_version import remove_edsl_version
-from edsl.Base import RepresentationMixin
+from ..utilities.remove_edsl_version import remove_edsl_version
+from ..base import RepresentationMixin
+#from ..surveys import Survey
 
 
 class Instruction(RepresentationMixin):
@@ -29,20 +30,19 @@ class Instruction(RepresentationMixin):
             "preamble": self.preamble,
         }
         if add_edsl_version:
-            from edsl import __version__
+            from .. import __version__
 
             d["edsl_version"] = __version__
             d["edsl_class_name"] = "Instruction"
         return d
 
     def add_question(self, question) -> "Survey":
-        from edsl.surveys.Survey import Survey
-
+        from ..surveys import Survey
         return Survey([self, question])
 
     def __hash__(self) -> int:
         """Return a hash of the question."""
-        from edsl.utilities.utilities import dict_hash
+        from ..utilities.utilities import dict_hash
 
         return dict_hash(self.to_dict(add_edsl_version=False))
 
@@ -54,3 +54,8 @@ class Instruction(RepresentationMixin):
             data["text"],
             data.get("preamble", "You were given the following instructions:"),
         )
+
+
+if __name__ == "__main__":
+    import doctest
+    doctest.testmod(optionflags=doctest.ELLIPSIS)

edsl/{surveys/instructions/InstructionCollection.py → instructions/instruction_collection.py}

@@ -1,11 +1,11 @@
 from typing import TYPE_CHECKING, Dict, List, Generator, Union
 from collections import UserDict
 
-from edsl.surveys.instructions.Instruction import Instruction
-from edsl.surveys.instructions.ChangeInstruction import ChangeInstruction
+from .instruction import Instruction
+from .change_instruction import ChangeInstruction
 
 if TYPE_CHECKING:
-    from edsl.questions.QuestionBase import QuestionBase
+    from ..questions import QuestionBase
 
 
 class InstructionCollection(UserDict):
@@ -25,7 +25,7 @@ class InstructionCollection(UserDict):
 
     def __getitem__(self, key):
         # in case the person uses question instead of the name
-        from edsl.questions.QuestionBase import QuestionBase
+        from ..questions import QuestionBase
 
         if isinstance(key, QuestionBase):
             key = key.name
@@ -60,7 +60,7 @@ class InstructionCollection(UserDict):
         self, question: Union[str, "QuestionBase"]
     ) -> Generator[Instruction, None, None]:
         ## Find all the questions that are after a given instruction
-        from edsl.questions.QuestionBase import QuestionBase
+        from ..questions import QuestionBase
 
         if isinstance(question, str):
             question_name = question
@@ -80,3 +80,8 @@ class InstructionCollection(UserDict):
 
     def __len__(self):
         return len(self.instruction_names_to_instruction)
+
+
+if __name__ == "__main__":
+    import doctest
+    doctest.testmod(optionflags=doctest.ELLIPSIS)

edsl/{surveys/InstructionHandler.py → instructions/instruction_handler.py}

@@ -53,9 +53,9 @@ class InstructionHandler:
         ...
         ValueError: ChangeInstruction change_instruction_0 references instruction poop which does not exist.
         """
-        from edsl.surveys.instructions.Instruction import Instruction
-        from edsl.surveys.instructions.ChangeInstruction import ChangeInstruction
-        from edsl.questions.QuestionBase import QuestionBase
+        from .instruction import Instruction
+        from .change_instruction import ChangeInstruction
+        from edsl.questions import QuestionBase
 
         true_questions = []
         instruction_names_to_instructions = {}

edsl/{jobs/interviews → interviews}/ReportErrors.py

@@ -1,7 +1,7 @@
 import json
 import requests
 import threading
-from edsl.coop import Coop
+from ..coop import Coop
 
 
 class ReportErrors:
@@ -41,7 +41,7 @@ class ReportErrors:
 
 
 def main():
-    from edsl.jobs.interviews.ReportErrors import ReportErrors
+    # Use the class directly since we're already in the module
 
     class TaskHistory:
         def __init__(self, data):

edsl/interviews/__init__.py

@@ -0,0 +1,4 @@
+from .interview_task_manager import InterviewTaskManager
+from .interview_status_dictionary import InterviewStatusDictionary
+from .interview_status_log import InterviewStatusLog
+from .interview import Interview