uncertainty-engine-types 0.0.8__tar.gz → 0.0.10__tar.gz

{uncertainty_engine_types-0.0.8 → uncertainty_engine_types-0.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: uncertainty-engine-types
-Version: 0.0.8
+Version: 0.0.10
 Summary: Common type definitions for the Uncertainty Engine
 Author: Freddy Wordingham
 Author-email: freddy@digilab.ai

{uncertainty_engine_types-0.0.8 → uncertainty_engine_types-0.0.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "uncertainty-engine-types"
-version = "0.0.8"
+version = "0.0.10"
 description = "Common type definitions for the Uncertainty Engine"
 authors = [
     { name = "Freddy Wordingham", email = "freddy@digilab.ai" },

{uncertainty_engine_types-0.0.8 → uncertainty_engine_types-0.0.10}/uncertainty_engine_types/__init__.py

@@ -1,15 +1,17 @@
 from . import utils
+from .chat_history import ChatHistory
 from .context import Context
-from .conversation import Conversation
+from .dataset import CSVDataset
+from .embeddings import TextEmbeddingsConfig, TextEmbeddingsProvider
 from .execution_error import ExecutionError
 from .file import (
+    PDF,
     Document,
     File,
     FileLocation,
     Image,
     LocalStorage,
     Mesh,
-    PDF,
     S3Storage,
     SQLTable,
     TabularData,
@@ -28,11 +30,11 @@ from .token import Token
 from .vector_store import VectorStoreConfig, VectorStoreProvider
 from .version import __version__
 
-
 __all__ = [
     "__version__",
+    "ChatHistory",
     "Context",
-    "Conversation",
+    "CSVDataset",
     "Document",
     "ExecutionError",
     "File",
@@ -62,6 +64,8 @@ __all__ = [
     "SQLTable",
     "TabularData",
     "TargetHandle",
+    "TextEmbeddingsConfig",
+    "TextEmbeddingsProvider",
     "Token",
     "utils",
     "VectorStoreConfig",

uncertainty_engine_types-0.0.8/uncertainty_engine_types/conversation.py → uncertainty_engine_types-0.0.10/uncertainty_engine_types/chat_history.py

@@ -3,5 +3,5 @@ from pydantic import BaseModel
 from .message import Message
 
 
-class Conversation(BaseModel):
+class ChatHistory(BaseModel):
     messages: list[Message]

uncertainty_engine_types-0.0.10/uncertainty_engine_types/dataset.py

@@ -0,0 +1,5 @@
+from pydantic import BaseModel
+
+
+class CSVDataset(BaseModel):
+    csv: str

uncertainty_engine_types-0.0.10/uncertainty_engine_types/embeddings.py

@@ -0,0 +1,32 @@
+from enum import StrEnum
+from typing import Optional
+
+from pydantic import BaseModel, model_validator
+
+
+class TextEmbeddingsProvider(StrEnum):
+    OPENAI = "openai"
+    OLLAMA = "ollama"
+
+
+class TextEmbeddingsConfig(BaseModel):
+    """
+    Connection configuration for text embedding models.
+    """
+
+    provider: str
+    model: Optional[str] = None
+    ollama_url: Optional[str] = None
+    openai_api_key: Optional[str] = None
+
+    @model_validator(mode="before")
+    @classmethod
+    def check_provider(cls, values):
+        provider = values.get("provider")
+        if provider == TextEmbeddingsProvider.OLLAMA and not values.get("ollama_url"):
+            raise ValueError("ollama_url must be provided for 'ollama' provider.")
+        if provider == TextEmbeddingsProvider.OPENAI and not values.get(
+            "openai_api_key"
+        ):
+            raise ValueError("openai_api_key must be provided for 'openai' provider.")
+        return values

uncertainty_engine_types-0.0.10/uncertainty_engine_types/llm.py

@@ -0,0 +1,31 @@
+from enum import StrEnum
+from typing import Optional
+
+from pydantic import BaseModel, model_validator
+
+
+class LLMProvider(StrEnum):
+    OPENAI = "openai"
+    OLLAMA = "ollama"
+
+
+class LLMConfig(BaseModel):
+    """
+    Connection configuration for Language Learning Models (LLMs).
+    """
+
+    provider: str
+    model: str
+    temperature: float = 0.0
+    ollama_url: Optional[str] = None
+    openai_api_key: Optional[str] = None
+
+    @model_validator(mode="before")
+    @classmethod
+    def check_provider(cls, values):
+        provider = values.get("provider")
+        if provider == LLMProvider.OLLAMA and not values.get("ollama_url"):
+            raise ValueError("ollama_url must be provided for 'ollama' provider.")
+        if provider == LLMProvider.OPENAI and not values.get("openai_api_key"):
+            raise ValueError("openai_api_key must be provided for 'openai' provider.")
+        return values

uncertainty_engine_types-0.0.10/uncertainty_engine_types/message.py

@@ -0,0 +1,10 @@
+from datetime import datetime
+from typing import Literal
+
+from pydantic import BaseModel
+
+
+class Message(BaseModel):
+    role: Literal["instruction", "user", "engine"]
+    content: str
+    timestamp: datetime

uncertainty_engine_types-0.0.10/uncertainty_engine_types/version.py

@@ -0,0 +1 @@
+__version__ = "0.0.10"

uncertainty_engine_types-0.0.8/uncertainty_engine_types/llm.py

@@ -1,21 +0,0 @@
-from enum import Enum
-from typing import Optional
-
-from pydantic import BaseModel
-
-
-class LLMProvider(Enum):
-    OPENAI = "openai"
-    OLLAMA = "ollama"
-
-
-class LLMConfig(BaseModel):
-    """
-    Connection configuration for Language Learning Models (LLMs).
-    """
-
-    provider: str
-    model: str
-    temperature: float = 0.0
-    ollama_url: Optional[str] = None
-    openai_api_key: Optional[str] = None

uncertainty_engine_types-0.0.8/uncertainty_engine_types/message.py

@@ -1,30 +0,0 @@
-from datetime import datetime
-from typing import Dict, Literal, Sequence, Union
-
-from pydantic import BaseModel, model_validator
-
-
-Value = Union[str, float, int]
-StructuredOutput = Dict[str, Union[Value, Sequence[Value], Dict[str, Value]]]
-
-
-class Message(BaseModel):
-    role: Literal["instruction", "user", "engine"]
-    content: Union[str, StructuredOutput]
-    timestamp: datetime
-
-    @model_validator(mode="before")
-    @classmethod
-    def validate(cls, values: Dict) -> Dict:
-        role = values.get("role")
-        content = values.get("content")
-
-        if role in ["instruction", "user"]:
-            if not isinstance(content, str):
-                raise ValueError(f"Content must be a string when role is {role}")
-        elif role == "engine":
-            if not isinstance(content, StructuredOutput):
-                raise ValueError(
-                    "Content must be a structured output when role is engine"
-                )
-        return values

uncertainty_engine_types-0.0.8/uncertainty_engine_types/version.py

@@ -1 +0,0 @@
-__version__ = "0.0.8"