uncertainty-engine-types 0.0.7__py3-none-any.whl → 0.0.9__py3-none-any.whl

uncertainty_engine_types/__init__.py

@@ -1,6 +1,8 @@
+from . import utils
 from .context import Context
 from .conversation import Conversation
-from .document import Document, FileLocation, FileType
+from .dataset import CSVDataset
+from .embeddings import TextEmbeddingsConfig, TextEmbeddingsProvider
 from .execution_error import ExecutionError
 from .file import (
     PDF,
@@ -24,7 +26,6 @@ from .model import MachineLearningModel
 from .node_info import NodeInfo, NodeInputInfo, NodeOutputInfo
 from .sensor_designer import SensorDesigner
 from .sql import SQLConfig, SQLKind
-from .tabular_data import TabularData
 from .token import Token
 from .vector_store import VectorStoreConfig, VectorStoreProvider
 from .version import __version__
@@ -33,13 +34,11 @@ __all__ = [
     "__version__",
     "Context",
     "Conversation",
-    "Document",
+    "CSVDataset",
     "Document",
     "ExecutionError",
     "File",
     "FileLocation",
-    "FileLocation",
-    "FileType",
     "Graph",
     "Handle",
     "Image",
@@ -64,9 +63,11 @@ __all__ = [
     "SQLKind",
     "SQLTable",
     "TabularData",
-    "TabularData",
     "TargetHandle",
+    "TextEmbeddingsConfig",
+    "TextEmbeddingsProvider",
     "Token",
+    "utils",
     "VectorStoreConfig",
     "VectorStoreProvider",
     "WebPage",

uncertainty_engine_types/{tabular_data.py → dataset.py}

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

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/llm.py

@@ -1,10 +1,10 @@
-from enum import Enum
+from enum import StrEnum
 from typing import Optional
 
-from pydantic import BaseModel
+from pydantic import BaseModel, model_validator
 
 
-class LLMProvider(Enum):
+class LLMProvider(StrEnum):
     OPENAI = "openai"
     OLLAMA = "ollama"
 
@@ -19,3 +19,13 @@ class LLMConfig(BaseModel):
     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/utils.py

@@ -0,0 +1,9 @@
+from pydantic import ValidationError
+
+
+def format_pydantic_errors(e: ValidationError) -> str:
+    msgs = []
+    for error in e.errors():
+        loc = " -> ".join(map(str, error["loc"]))
+        msgs.append(f"Error at '{loc}': {error['msg']}")
+    return "\n".join(msgs)

uncertainty_engine_types/version.py

@@ -1 +1 @@
-__version__ = "0.0.7"
+__version__ = "0.0.9"

{uncertainty_engine_types-0.0.7.dist-info → uncertainty_engine_types-0.0.9.dist-info}/METADATA

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

{uncertainty_engine_types-0.0.7.dist-info → uncertainty_engine_types-0.0.9.dist-info}/RECORD

@@ -1,22 +1,23 @@
-uncertainty_engine_types/__init__.py,sha256=-zZvzfCbTO7xnXVT7lBnnoDtRbYqGhXoiq6lKNxSS6I,1610
+uncertainty_engine_types/__init__.py,sha256=G8H0XonAfxXoXlgeQK7FsxuMRgXosOZfm-jp6P5aHu0,1656
 uncertainty_engine_types/context.py,sha256=k9rlArn-L2x1P5vWy5khfuqJW5tJOqr3NlhubZCbyG4,209
 uncertainty_engine_types/conversation.py,sha256=uDHTr4uPzjkcflhyFAanfiQ1KbEIs4C9jogrwzOEt_s,122
-uncertainty_engine_types/document.py,sha256=Htpiq_Z1r1-pUAgeperFN8CQ4syBAAQibd_u-ITY1mo,449
+uncertainty_engine_types/dataset.py,sha256=sDpQu5X3KxJ1lNkZOwhppJ2SY0Cv19cbcYfGpp_hyUQ,75
+uncertainty_engine_types/embeddings.py,sha256=PmbaT7A7IuQ1UbGVNIg4usNnDbEgWiXM87gQPOeaff8,954
 uncertainty_engine_types/execution_error.py,sha256=tvIBuZPM8UhFUERHCEqoW8blAYYuBq1ZqidO0i_BCGs,105
 uncertainty_engine_types/file.py,sha256=J202bhOIVnvvvAG54sXyYF8fwjZGTUP3097ARnRnb3Q,579
 uncertainty_engine_types/graph.py,sha256=ii2YT2jxoRB7UhcceI2k_ArKmlUXEwBCRBpsEUjL2Qg,265
 uncertainty_engine_types/handle.py,sha256=buX_xEdBwT7vZRs5uCEPB6VCbSWIFbCE-NYIL4fZSjg,942
 uncertainty_engine_types/job.py,sha256=eYDe-MW4s-kXGL1Ke1VxdwoduW66orJAa0L1XwGdYi0,347
-uncertainty_engine_types/llm.py,sha256=oivoY3aDv5Rsk8FWA-vOPEFfK9a6-SqSyu01AlEuO7o,406
+uncertainty_engine_types/llm.py,sha256=kuhTlkTIgE8oIYLofr7MOcz6S5qiN0w5FxfNcT05-E4,910
 uncertainty_engine_types/message.py,sha256=KncFJQHL_ko8nfOuso_eh7i2gB0y4nXI6gBW9U8lAEY,971
 uncertainty_engine_types/model.py,sha256=O9E_7DE9AKEc1o2VnhpUyl3Quh4sGdV43gqDJwk-y68,196
 uncertainty_engine_types/node_info.py,sha256=2p87fCdX_CrdT2ZODtGJ-mR1Mvg46WhaE1GMddaEVak,800
 uncertainty_engine_types/sensor_designer.py,sha256=hr3ek4_dRjRK0-78uaT6h8-bGUCm7Mfs6mxJSWxE64c,80
 uncertainty_engine_types/sql.py,sha256=SBzmgMEZ-sa-OBRoZbmKiOqddop4zJixgxx-JCus9fY,298
-uncertainty_engine_types/tabular_data.py,sha256=i_1LfgQqxDanPRWuDkP3Hd8-9eVet6FbPIlPZlAi1n0,76
 uncertainty_engine_types/token.py,sha256=4tQQkvl-zsYoVk8ZEx0cB2JiU0VDRJ6uUe76XBXEpBY,178
+uncertainty_engine_types/utils.py,sha256=72QVig8Kb5uIR-e1nofm-3x9CouebdQJIruDbq-aIn0,271
 uncertainty_engine_types/vector_store.py,sha256=9fYPJ04jWcy2DruyUSjiKQAgmqq-wgeAi5dBIrAOm30,392
-uncertainty_engine_types/version.py,sha256=R9xOYoYrWKcfO5zvTeGC3m_eDNOvxMd8CocQs2tLufo,22
-uncertainty_engine_types-0.0.7.dist-info/METADATA,sha256=-aXHfv64fSzVlzn0JBTdmy_0Q-JC5pNWZwvSzz97alI,2815
-uncertainty_engine_types-0.0.7.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-uncertainty_engine_types-0.0.7.dist-info/RECORD,,
+uncertainty_engine_types/version.py,sha256=46Yjk3fz9o8aTN8E95McnzpJcjGzVJmHmQqUZ5mXzfc,22
+uncertainty_engine_types-0.0.9.dist-info/METADATA,sha256=nAO5QC9gAFMHlvPhlPUR5jGij0OSIYic8VZ7R5eiITA,2815
+uncertainty_engine_types-0.0.9.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+uncertainty_engine_types-0.0.9.dist-info/RECORD,,

uncertainty_engine_types/document.py

@@ -1,29 +0,0 @@
-from enum import StrEnum
-from typing import Optional
-
-from pydantic import BaseModel
-
-
-class FileLocation(StrEnum):
-    LOCAL = "local"
-    S3 = "s3"
-    SQL = "sql"
-    WWW = "www"
-
-
-class FileType(StrEnum):
-    CSV = "csv"
-    DOCX = "docx"
-    PDF = "pdf"
-    TXT = "txt"
-
-
-class Document(BaseModel):
-    """
-    Document identification.
-    """
-
-    location: FileLocation
-    file_type: FileType
-    path: str
-    excerpt: Optional[str] = None