Merge pull request #6 from christo-olivier/feature/make-imports-easier

Import and re-export objects in top level __init__.py

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "modelsmith"
-version = "0.2.3"
+version = "0.3.0"
 description = "Get Pydantic models and Python types as LLM responses from Google Vertex AI models."
 authors = ["Christo Olivier <[email protected]>"]
 maintainers = ["Christo Olivier <[email protected]>"]

src/modelsmith/__init__.py

@@ -1,3 +1,12 @@
+from .exceptions import ModelNotDerivedError, PatternNotFound
 from .forge import Forge
+from .language_model import LanguageModelWrapper
+from .prompt import Prompt
 
-__all__ = ["Forge"]
+__all__ = [
+    "Forge",
+    "LanguageModelWrapper",
+    "Prompt",
+    "ModelNotDerivedError",
+    "PatternNotFound",
+]

src/modelsmith/exceptions.py

@@ -13,18 +13,18 @@ def __str__(self) -> str:
         return ", ".join(str(e) for e in self.exceptions)
 
 
-class PatternNotFound(Exception):
+class ModelNotDerivedError(Exception):
     """
-    Exception used when a pattern being searched for has not been found.
+    Exception raised when a pydantic model could not be created from the response of
+    the LLM.
     """
 
     pass
 
 
-class ModelNotDerivedError(Exception):
+class PatternNotFound(Exception):
     """
-    Exception raised when a pydantic model could not be created from the response of
-    the LLM.
+    Exception used when a pattern being searched for has not been found.
     """
 
     pass

tests/test_forge.py

@@ -2,8 +2,7 @@
 from typing import Any
 
 import pytest
-from modelsmith.exceptions import ModelNotDerivedError
-from modelsmith.forge import Forge
+from modelsmith import Forge, ModelNotDerivedError
 from vertexai.generative_models import GenerativeModel
 from vertexai.language_models import ChatModel, TextGenerationModel
 

tests/test_prompt.py

@@ -1,6 +1,6 @@
 import inspect
 
-from modelsmith.prompt import Prompt
+from modelsmith import Prompt
 
 
 def test_render_prompt_user_input() -> None: