Bump version to 0.2.3 in pyproject.toml

CHANGELOG.md

@@ -1,11 +1,6 @@
 Release History
 ===============
 
-
-## 0.2.4 (2024-11-11)
-
-- General improvements.
-
 ## 0.2.3 (2024-11-04)
 
 - Remove default max-tokens for OpenAI provider.

examples/cooking_recipe_example.py

@@ -1,5 +1,5 @@
-from _context import simplemind as sm
 from pydantic import BaseModel
+from _context import simplemind as sm
 from rich.console import Console
 from rich.panel import Panel
 from rich.text import Text

examples/discussion.py

@@ -1,10 +1,11 @@
 import time
 from typing import List, Tuple
 
-from _context import sm
 from rich.console import Console
 from rich.markdown import Markdown
 
+from _context import sm
+
 
 class MultiAIConversation:
     """Orchestrates conversations between multiple AI models."""

examples/enhanced_context.py

@@ -1,29 +1,36 @@
-import contextlib
-import logging
-import os
-import random
-import re
-import sqlite3
-from concurrent.futures import ThreadPoolExecutor
-from contextlib import contextmanager
 from datetime import datetime
+import logging
+import sqlite3
 from typing import List
+import re
+import os
+import contextlib
+
+import spacy
+from contextlib import contextmanager
+
+from _context import simplemind as sm
 
 import nltk
-import spacy
-import xerox
-from _context import simplemind as sm
-from docopt import docopt
-from nltk.tag import pos_tag
 from nltk.tokenize import word_tokenize
-from prompt_toolkit import PromptSession
-from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
-from prompt_toolkit.completion import Completer, Completion
+from nltk.tag import pos_tag
+
 from rich.console import Console
-from rich.markdown import Markdown
 from rich.panel import Panel
+from rich.markdown import Markdown
 from rich.status import Status
 
+from concurrent.futures import ThreadPoolExecutor
+import random
+
+from docopt import docopt
+
+from prompt_toolkit import PromptSession
+from prompt_toolkit.completion import Completer, Completion
+from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
+
+import xerox
+
 DB_PATH = "enhanced_context.db"
 AVAILABLE_PROVIDERS = ["xai", "openai", "anthropic", "ollama"]
 

examples/four_way_conversation.py

@@ -1,5 +1,4 @@
 import time
-
 from _context import simplemind as sm
 
 

examples/inspiration_plugin.py

@@ -1,5 +1,4 @@
 import random
-
 from _context import simplemind as sm
 
 

examples/medicine_data.py

@@ -1,5 +1,5 @@
-from _context import simplemind as sm
 from pydantic import BaseModel
+from _context import simplemind as sm
 from rich.console import Console
 from rich.panel import Panel
 from rich.table import Table

examples/mood_detector_plugin.py

@@ -1,7 +1,7 @@
 import nltk
-from _context import simplemind as sm
 from nltk.sentiment import SentimentIntensityAnalyzer
 from rich.console import Console
+from _context import simplemind as sm
 
 nltk.download("vader_lexicon")
 

examples/sentiment_analysis.py

@@ -5,7 +5,6 @@ from pydantic import BaseModel
 
 # Note: you should probably be using textblob for this.
 
-
 class SentimentAnalysis(BaseModel):
     sentiment: Literal["positive", "negative", "neutral"]
     confidence: float

examples/web_bible_explorer.py

@@ -1,10 +1,8 @@
-from typing import List
-
-from fastapi import FastAPI, HTTPException, Request
-from fastapi.staticfiles import StaticFiles
+from fastapi import FastAPI, Request, HTTPException
 from fastapi.templating import Jinja2Templates
+from fastapi.staticfiles import StaticFiles
 from pydantic import BaseModel
-
+from typing import List
 import simplemind as sm
 
 app = FastAPI()

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "simplemind"
-version = "0.2.4"
+version = "0.2.3"
 description = "An experimental client for AI providers that intends to replace LangChain and LangGraph for most common use cases."
 readme = "README.md"
 requires-python = ">=3.10"
@@ -10,18 +10,18 @@ dependencies = ["pydantic", "pydantic-settings", "instructor", "logfire"]
 full = [
     "openai",
     "anthropic",
+    "ollama",
     "groq",
     "google-generativeai",
     "botocore",
     "boto3"
 ]
-amazon = ["boto3", "botocore", "anthropic"]
-anthropic = ["anthropic"]
-gemini = ["google-generativeai"]
-groq = ["groq"]
-ollama = ["openai"]
 openai = ["openai"]
-xai = ["openai"]
+anthropic = ["anthropic"]
+ollama = ["ollama", "openai"]
+groq = ["groq"]
+gemini = ["google-generativeai"]
+amazon = ["boto3", "botocore", "anthropic"]
 
 [build-system]
 requires = ["hatchling"]

simplemind/providers/__init__.py

@@ -1,32 +1,12 @@
 from typing import List, Type
 
 from ._base import BaseProvider
-from .amazon import Amazon
 from .anthropic import Anthropic
 from .gemini import Gemini
 from .groq import Groq
 from .ollama import Ollama
 from .openai import OpenAI
 from .xai import XAI
+from .amazon import Amazon
 
-providers: List[Type[BaseProvider]] = [
-    Anthropic,
-    Gemini,
-    Groq,
-    OpenAI,
-    Ollama,
-    XAI,
-    Amazon,
-]
-
-__all__ = [
-    "Anthropic",
-    "Gemini",
-    "Groq",
-    "OpenAI",
-    "Ollama",
-    "XAI",
-    "Amazon",
-    "providers",
-    "BaseProvider",
-]
+providers: List[Type[BaseProvider]] = [Anthropic, Gemini, Groq, OpenAI, Ollama, XAI, Amazon]

simplemind/providers/amazon.py

@@ -1,22 +1,22 @@
+from typing import Type, TypeVar, Iterator
 from functools import cached_property
-from typing import TYPE_CHECKING, Iterator, Type, TypeVar
 
 import instructor
 from pydantic import BaseModel
 
-from ..settings import settings
 from ._base import BaseProvider
-
-if TYPE_CHECKING:
-    from ..models import Conversation, Message
+from ..settings import settings
 
 T = TypeVar("T", bound=BaseModel)
 
+PROVIDER_NAME = "amazon"
+DEFAULT_MODEL = "us.anthropic.claude-3-5-sonnet-20241022-v2:0"
+DEFAULT_MAX_TOKENS = 5_000
+
 
 class Amazon(BaseProvider):
-    NAME = "amazon"
-    DEFAULT_MODEL = "us.anthropic.claude-3-5-sonnet-20241022-v2:0"
-    DEFAULT_MAX_TOKENS = 5_000
+    NAME = PROVIDER_NAME
+    DEFAULT_MODEL = DEFAULT_MODEL
     supports_streaming = True
 
     def __init__(self, profile_name: str | None = None):
@@ -25,12 +25,7 @@ class Amazon(BaseProvider):
     @cached_property
     def client(self):
         """The AnthropicBedrock client."""
-        try:
-            import anthropic
-        except ImportError as exc:
-            raise ImportError(
-                "Please install the `anthropic` package: `pip install anthropic`"
-            ) from exc
+        import anthropic
 
         if not self.profile_name:
             raise ValueError("Profile name is not provided")
@@ -38,12 +33,12 @@ class Amazon(BaseProvider):
         return anthropic.AnthropicBedrock(aws_profile=self.profile_name)
 
     @cached_property
-    def structured_client(self) -> instructor.Instructor:
+    def structured_client(self):
         """A client patched with Instructor."""
 
         return instructor.from_anthropic(self.client)
 
-    def send_conversation(self, conversation: "Conversation", **kwargs) -> "Message":
+    def send_conversation(self, conversation: "Conversation", **kwargs):
         """Send a conversation to the OpenAI API."""
 
         from ..models import Message
@@ -64,7 +59,7 @@ class Amazon(BaseProvider):
             role="assistant",
             text=assistant_message.content or "",
             raw=response,
-            llm_model=conversation.llm_model or self.DEFAULT_MODEL,
+            llm_model=conversation.llm_model or DEFAULT_MODEL,
             llm_provider=PROVIDER_NAME,
         )
 
@@ -80,12 +75,12 @@ class Amazon(BaseProvider):
             messages=messages,
             model=llm_model or self.DEFAULT_MODEL,
             response_model=response_model,
-            max_tokens=self.DEFAULT_MAX_TOKENS,
+            max_tokens=DEFAULT_MAX_TOKENS,
             **kwargs,
         )
         return response
 
-    def generate_text(self, prompt: str, *, llm_model: str, **kwargs):
+    def generate_text(self, prompt, *, llm_model, **kwargs):
         messages = [
             {"role": "user", "content": prompt},
         ]
@@ -93,15 +88,13 @@ class Amazon(BaseProvider):
         response = self.client.messages.create(
             model=llm_model or self.DEFAULT_MODEL,
             messages=messages,
-            max_tokens=self.DEFAULT_MAX_TOKENS,
+            max_tokens=DEFAULT_MAX_TOKENS,
             **kwargs,
         )
 
         return response.content[0].text
 
-    def generate_stream_text(
-        self, prompt: str, *, llm_model: str, **kwargs
-    ) -> Iterator[str]:
+    def generate_stream_text(self, prompt, *, llm_model, **kwargs) -> Iterator[str]:
         """Generate streaming text using the Amazon API."""
 
         # Prepare the messages.

simplemind/providers/anthropic.py

@@ -1,5 +1,5 @@
 from functools import cached_property
-from typing import TYPE_CHECKING, Iterator, Type, TypeVar
+from typing import TYPE_CHECKING, Type, TypeVar, Iterator
 
 import instructor
 from pydantic import BaseModel
@@ -14,15 +14,20 @@ if TYPE_CHECKING:
 T = TypeVar("T", bound=BaseModel)
 
 
+PROVIDER_NAME = "anthropic"
+DEFAULT_MODEL = "claude-3-5-sonnet-20241022"
+DEFAULT_MAX_TOKENS = 1_000
+DEFAULT_KWARGS = {"max_tokens": DEFAULT_MAX_TOKENS}
+
+
 class Anthropic(BaseProvider):
-    NAME = "anthropic"
-    DEFAULT_MODEL = "claude-3-5-sonnet-20241022"
-    DEFAULT_MAX_TOKENS = 1_000
-    DEFAULT_KWARGS = {"max_tokens": DEFAULT_MAX_TOKENS}
+    NAME = PROVIDER_NAME
+    DEFAULT_MODEL = DEFAULT_MODEL
+    DEFAULT_KWARGS = DEFAULT_KWARGS
     supports_streaming = True
 
     def __init__(self, api_key: str | None = None):
-        self.api_key = api_key or settings.get_api_key(self.NAME)
+        self.api_key = api_key or settings.get_api_key(PROVIDER_NAME)
 
     @cached_property
     def client(self):
@@ -67,7 +72,7 @@ class Anthropic(BaseProvider):
             text=assistant_message,
             raw=response,
             llm_model=conversation.llm_model or self.DEFAULT_MODEL,
-            llm_provider=self.NAME,
+            llm_provider=PROVIDER_NAME,
         )
 
     @logger

simplemind/providers/gemini.py

@@ -2,7 +2,7 @@
 # IT is not currently working as desired.
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Iterator, Type, TypeVar
+from typing import TYPE_CHECKING, Type, TypeVar, Iterator
 
 import instructor
 from pydantic import BaseModel
@@ -17,14 +17,18 @@ if TYPE_CHECKING:
 T = TypeVar("T", bound=BaseModel)
 
 
+PROVIDER_NAME = "gemini"
+DEFAULT_MODEL = "models/gemini-1.5-flash-latest"
+
+
 class Gemini(BaseProvider):
-    NAME = "gemini"
-    DEFAULT_MODEL = "models/gemini-1.5-flash-latest"
+    NAME = PROVIDER_NAME
+    DEFAULT_MODEL = DEFAULT_MODEL
     supports_streaming = True
 
     def __init__(self, api_key: str | None = None):
-        self.api_key = api_key or settings.get_api_key(self.NAME)
-        self.model_name = self.DEFAULT_MODEL
+        self.api_key = api_key or settings.get_api_key(PROVIDER_NAME)
+        self.model_name = DEFAULT_MODEL
 
     def set_model(self, model_name: str):
         self.model_name = model_name
@@ -72,7 +76,7 @@ class Gemini(BaseProvider):
             text=response.text,
             raw=response,
             llm_model=self.model_name,
-            llm_provider=self.NAME,
+            llm_provider=PROVIDER_NAME,
         )
 
     @logger

simplemind/providers/groq.py

@@ -1,5 +1,5 @@
 from functools import cached_property
-from typing import TYPE_CHECKING, Iterator, Type, TypeVar
+from typing import TYPE_CHECKING, Type, TypeVar, Iterator
 
 import instructor
 from pydantic import BaseModel
@@ -14,15 +14,20 @@ if TYPE_CHECKING:
 T = TypeVar("T", bound=BaseModel)
 
 
+PROVIDER_NAME = "groq"
+DEFAULT_MODEL = "llama3-8b-8192"
+DEFAULT_MAX_TOKENS = 1_000
+DEFAULT_KWARGS = {"max_tokens": DEFAULT_MAX_TOKENS}
+
+
 class Groq(BaseProvider):
-    NAME = "groq"
-    DEFAULT_MODEL = "llama3-8b-8192"
-    DEFAULT_MAX_TOKENS = 1_000
-    DEFAULT_KWARGS = {"max_tokens": DEFAULT_MAX_TOKENS}
+    NAME = PROVIDER_NAME
+    DEFAULT_MODEL = DEFAULT_MODEL
+    DEFAULT_KWARGS = DEFAULT_KWARGS
     supports_streaming = True
 
     def __init__(self, api_key: str | None = None):
-        self.api_key = api_key or settings.get_api_key(self.NAME)
+        self.api_key = api_key or settings.get_api_key(PROVIDER_NAME)
 
     @cached_property
     def client(self):
@@ -70,7 +75,7 @@ class Groq(BaseProvider):
             text=assistant_message.content or "",
             raw=response,
             llm_model=conversation.llm_model or self.DEFAULT_MODEL,
-            llm_provider=self.NAME,
+            llm_provider=PROVIDER_NAME,
         )
 
     @logger

simplemind/providers/ollama.py

@@ -1,7 +1,8 @@
 from functools import cached_property
-from typing import TYPE_CHECKING, Iterator, Type, TypeVar
+from typing import TYPE_CHECKING, Type, TypeVar, Iterator
 
 import instructor
+from openai import OpenAI
 from pydantic import BaseModel
 
 from ..logging import logger
@@ -14,11 +15,17 @@ if TYPE_CHECKING:
 T = TypeVar("T", bound=BaseModel)
 
 
+PROVIDER_NAME = "ollama"
+DEFAULT_MODEL = "llama3.2"
+DEFAULT_TIMEOUT = 60
+DEFAULT_KWARGS = {}
+
+
 class Ollama(BaseProvider):
-    NAME = "ollama"
-    DEFAULT_MODEL = "llama3.2"
-    DEFAULT_TIMEOUT = 60
-    DEFAULT_KWARGS = {}
+    NAME = PROVIDER_NAME
+    DEFAULT_MODEL = DEFAULT_MODEL
+    DEFAULT_KWARGS = DEFAULT_KWARGS
+    TIMEOUT = DEFAULT_TIMEOUT
     supports_streaming = True
 
     def __init__(self, host_url: str | None = None):
@@ -30,18 +37,21 @@ class Ollama(BaseProvider):
         if not self.host_url:
             raise ValueError("No ollama host url provided")
         try:
-            import openai
+            import ollama as ol
         except ImportError as exc:
             raise ImportError(
-                "Please install the `openai` package: `pip install openai`"
+                "Please install the `ollama` package: `pip install ollama`"
             ) from exc
-        return openai.OpenAI(base_url=f"{self.host_url}/v1", api_key="ollama")
+        return ol.Client(timeout=self.TIMEOUT, host=self.host_url)
 
     @cached_property
     def structured_client(self) -> instructor.Instructor:
         """A client patched with Instructor."""
         return instructor.from_openai(
-            self.client,
+            OpenAI(
+                base_url=f"{self.host_url}/v1",
+                api_key="ollama",
+            ),
             mode=instructor.Mode.JSON,
         )
 
@@ -54,7 +64,7 @@ class Ollama(BaseProvider):
             {"role": msg.role, "content": msg.text} for msg in conversation.messages
         ]
         response = self.client.chat(
-            model=conversation.llm_model or self.DEFAULT_MODEL,
+            model=conversation.llm_model or DEFAULT_MODEL,
             messages=messages,
             **{**self.DEFAULT_KWARGS, **kwargs},
         )
@@ -66,7 +76,7 @@ class Ollama(BaseProvider):
             text=assistant_message.get("content"),
             raw=response,
             llm_model=conversation.llm_model or self.DEFAULT_MODEL,
-            llm_provider=self.NAME,
+            llm_provider=PROVIDER_NAME,
         )
 
     @logger

simplemind/providers/openai.py

@@ -1,5 +1,5 @@
 from functools import cached_property
-from typing import TYPE_CHECKING, Iterator, Type, TypeVar
+from typing import TYPE_CHECKING, Type, TypeVar, Iterator
 
 import instructor
 from pydantic import BaseModel
@@ -13,16 +13,20 @@ if TYPE_CHECKING:
 
 T = TypeVar("T", bound=BaseModel)
 
+PROVIDER_NAME = "openai"
+DEFAULT_MODEL = "gpt-4o-mini"
+DEFAULT_MAX_TOKENS = None
+DEFAULT_KWARGS = {}
+
 
 class OpenAI(BaseProvider):
-    NAME = "openai"
-    DEFAULT_MODEL = "gpt-4o-mini"
-    DEFAULT_MAX_TOKENS = None
-    DEFAULT_KWARGS = {}
+    NAME = PROVIDER_NAME
+    DEFAULT_MODEL = DEFAULT_MODEL
+    DEFAULT_KWARGS = DEFAULT_KWARGS
     supports_streaming = True
 
     def __init__(self, api_key: str | None = None):
-        self.api_key = api_key or settings.get_api_key(self.NAME)
+        self.api_key = api_key or settings.get_api_key(PROVIDER_NAME)
 
     @cached_property
     def client(self):
@@ -52,7 +56,7 @@ class OpenAI(BaseProvider):
         ]
 
         response = self.client.chat.completions.create(
-            model=conversation.llm_model or self.DEFAULT_MODEL,
+            model=conversation.llm_model or DEFAULT_MODEL,
             messages=messages,
             **{**self.DEFAULT_KWARGS, **kwargs},
         )
@@ -65,8 +69,8 @@ class OpenAI(BaseProvider):
             role="assistant",
             text=assistant_message.content or "",
             raw=response,
-            llm_model=conversation.llm_model or self.DEFAULT_MODEL,
-            llm_provider=self.NAME,
+            llm_model=conversation.llm_model or DEFAULT_MODEL,
+            llm_provider=PROVIDER_NAME,
         )
 
     @logger

simplemind/providers/xai.py

@@ -1,5 +1,5 @@
 from functools import cached_property
-from typing import TYPE_CHECKING, Iterator, Type, TypeVar
+from typing import TYPE_CHECKING, Type, TypeVar, Iterator
 
 import instructor
 from pydantic import BaseModel
@@ -14,17 +14,22 @@ if TYPE_CHECKING:
 T = TypeVar("T", bound=BaseModel)
 
 
+PROVIDER_NAME = "xai"
+DEFAULT_MODEL = "grok-beta"
+BASE_URL = "https://api.x.ai/v1"
+DEFAULT_MAX_TOKENS = 1000
+DEFAULT_KWARGS = {"max_tokens": DEFAULT_MAX_TOKENS}
+
+
 class XAI(BaseProvider):
-    NAME = "xai"
-    DEFAULT_MODEL = "grok-beta"
-    DEFAULT_MAX_TOKENS = 1000
-    DEFAULT_KWARGS = {"max_tokens": DEFAULT_MAX_TOKENS}
-    BASE_URL = "https://api.x.ai/v1"
+    NAME = PROVIDER_NAME
+    DEFAULT_MODEL = DEFAULT_MODEL
+    DEFAULT_KWARGS = DEFAULT_KWARGS
     supports_streaming = True
     supports_structured_responses = False
 
     def __init__(self, api_key: str | None = None):
-        self.api_key = api_key or settings.get_api_key(self.NAME)
+        self.api_key = api_key or settings.get_api_key(PROVIDER_NAME)
 
     @cached_property
     def client(self):
@@ -39,7 +44,7 @@ class XAI(BaseProvider):
             ) from exc
         return oa.OpenAI(
             api_key=self.api_key,
-            base_url=self.BASE_URL,
+            base_url=BASE_URL,
         )
 
     @cached_property
@@ -71,7 +76,7 @@ class XAI(BaseProvider):
             text=assistant_message.content,
             raw=response,
             llm_model=conversation.llm_model or self.DEFAULT_MODEL,
-            llm_provider=self.NAME,
+            llm_provider=PROVIDER_NAME,
         )
 
     @logger

simplemind/settings.py

@@ -14,9 +14,8 @@ class LoggingConfig(BaseSettings):
         """Enable logging for the application."""
         # adding imports here to avoid forced dependencies
         try:
-            from logging import basicConfig
-
             import logfire
+            from logging import basicConfig
         except ImportError as e:
             raise ImportError(
                 "To enable logging, please install logfire: `pip install logfire`"

tests/test_conversations.py

@@ -1,7 +1,8 @@
 import pytest
 
+from simplemind.providers import Anthropic, Gemini, OpenAI, Groq, Ollama, Amazon
+
 import simplemind as sm
-from simplemind.providers import Amazon, Anthropic, Gemini, Groq, Ollama, OpenAI
 
 
 @pytest.mark.parametrize(

tests/test_generate_data.py

@@ -1,7 +1,8 @@
 import pytest
-from pydantic import BaseModel
 
-from simplemind.providers import Amazon, Anthropic, Gemini, Groq, Ollama, OpenAI
+from simplemind.providers import Anthropic, Gemini, OpenAI, Groq, Ollama, Amazon
+
+from pydantic import BaseModel
 
 
 class ResponseModel(BaseModel):

tests/test_generate_text.py

@@ -1,6 +1,6 @@
 import pytest
 
-from simplemind.providers import Amazon, Anthropic, Gemini, Groq, Ollama, OpenAI
+from simplemind.providers import Anthropic, Gemini, OpenAI, Groq, Ollama, Amazon
 
 
 @pytest.mark.parametrize(