From b53dbea9f5a5290633a82064309fb802421c5dc1 Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Wed, 17 Jan 2024 15:26:54 -0700 Subject: [PATCH 1/7] pydantic change for example.py --- swarms/tools/tool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swarms/tools/tool.py b/swarms/tools/tool.py index 1029a183..f0090493 100644 --- a/swarms/tools/tool.py +++ b/swarms/tools/tool.py @@ -276,7 +276,7 @@ class ChildTool(BaseTool): } return tool_input - @root_validator() + @root_validator(skip_on_failure=True) def raise_deprecation(cls, values: Dict) -> Dict: """Raise deprecation warning if callback_manager is used.""" if values.get("callback_manager") is not None: From b83d6f0dac32faf2aa20910fb3e1b3f9dada50fe Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Fri, 19 Jan 2024 17:56:01 -0700 Subject: [PATCH 2/7] ReleaseNotes --- docs/ReleaseNotes.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 docs/ReleaseNotes.md diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md new file mode 100644 index 00000000..31f72e80 --- /dev/null +++ b/docs/ReleaseNotes.md @@ -0,0 +1,21 @@ +# Release Notes + +## 3.6.8 + +2024-01-19 + +### Bug Fixes + +Removed ModelScope + +Removed CogAgent + +### New Features + +Added ultralytics vision models + +Added TimmModel to wrap timm models + +### Other + +Loosened version of timm From 8383e8b0624f2d587b5bac0651f13562e225f872 Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Sun, 21 Jan 2024 12:37:15 -0700 Subject: [PATCH 3/7] Readme to 3.7.5 --- docs/ReleaseNotes.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md index 31f72e80..f8859fa0 100644 --- a/docs/ReleaseNotes.md +++ b/docs/ReleaseNotes.md @@ -1,5 +1,33 @@ # Release Notes +## 3.7.5 + +2024-01-21 + +### Bug Fixes + +Fix imports of Agent, SequentialWorkflow, ModelParallelizer, Task, OpenAIChat, Gemini, GPT4VisionAPI + +### New Features + +New model: Odin for Object Detection and tracking +New mode: Ultralytics Object recognition YOLO + +New Tokenizers + +Schema generator for prompts. +New prompt for worker agent. + +New structure: plan, step + +New tool: execute tool + +New logger: get_logger + +Example for worker_agent + + + ## 3.6.8 2024-01-19 From 71df100c45173251f68bf8ab5f78b99958367940 Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Sun, 28 Jan 2024 16:38:02 -0700 Subject: [PATCH 4/7] base_vectordb fix --- swarms/memory/{base_vectordatabase.py => base_vectordb.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename swarms/memory/{base_vectordatabase.py => base_vectordb.py} (100%) diff --git a/swarms/memory/base_vectordatabase.py b/swarms/memory/base_vectordb.py similarity index 100% rename from swarms/memory/base_vectordatabase.py rename to swarms/memory/base_vectordb.py From d62eac4bb9dc866cb5a902db5b120c42ae7d88b3 Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Sun, 28 Jan 2024 16:52:32 -0700 Subject: [PATCH 5/7] abstract vector db import --- swarms/memory/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/swarms/memory/__init__.py b/swarms/memory/__init__.py index 1d52d718..f6ab4750 100644 --- a/swarms/memory/__init__.py +++ b/swarms/memory/__init__.py @@ -1,11 +1,11 @@ -from swarms.memory.base_vectordb import AbstractDatabase +from swarms.memory.base_vectordb import AbstractVectorDatabase from swarms.memory.short_term_memory import ShortTermMemory from swarms.memory.sqlite import SQLiteDB from swarms.memory.weaviate_db import WeaviateDB from swarms.memory.visual_memory import VisualShortTermMemory __all__ = [ - "AbstractDatabase", + "AbstractVectorDatabase", "ShortTermMemory", "SQLiteDB", "WeaviateDB", From ad057a56c63458f69c58a479b8488d8b3d075960 Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Sun, 28 Jan 2024 17:01:41 -0700 Subject: [PATCH 6/7] abstract vector db --- swarms/structs/agent.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swarms/structs/agent.py b/swarms/structs/agent.py index bd245ba7..a5173482 100644 --- a/swarms/structs/agent.py +++ b/swarms/structs/agent.py @@ -9,7 +9,7 @@ from typing import Any, Callable, Dict, List, Optional, Tuple from termcolor import colored -from swarms.memory.base_vectordb import AbstractDatabase +from swarms.memory.base_vectordb import AbstractVectorDatabase from swarms.prompts.agent_system_prompts import ( AGENT_SYSTEM_PROMPT_3, ) From 8df8c68853eb46bec1e5a60145b4e0cc2a954997 Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Sun, 28 Jan 2024 17:25:01 -0700 Subject: [PATCH 7/7] AbstractVectorDB, pinecone --- pyproject.toml | 1 + requirements.txt | 3 ++- swarms/memory/pinecone.py | 4 ++-- swarms/memory/sqlite.py | 4 ++-- swarms/memory/weaviate_db.py | 4 ++-- swarms/structs/agent.py | 4 ++-- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 31b72863..31c7be39 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -74,6 +74,7 @@ ultralytics = "*" timm = "*" supervision = "*" scikit-image = "*" +pinecone-client = "*" diff --git a/requirements.txt b/requirements.txt index ab78bb36..1ef64bf7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -62,4 +62,5 @@ peft psutil ultralytics supervision -scikit-image \ No newline at end of file +scikit-image +pinecone-client \ No newline at end of file diff --git a/swarms/memory/pinecone.py b/swarms/memory/pinecone.py index bf073d3e..b1c0edf3 100644 --- a/swarms/memory/pinecone.py +++ b/swarms/memory/pinecone.py @@ -1,12 +1,12 @@ from typing import Optional -from swarms.memory.base_vectordb import AbstractDatabase +from swarms.memory.base_vectordb import AbstractVectorDatabase import pinecone from attr import define, field from swarms.utils.hash import str_to_hash @define -class PineconeDB(AbstractDatabase): +class PineconeDB(AbstractVectorDatabase): """ PineconeDB is a vector storage driver that uses Pinecone as the underlying storage engine. diff --git a/swarms/memory/sqlite.py b/swarms/memory/sqlite.py index 2c4f2740..542be34b 100644 --- a/swarms/memory/sqlite.py +++ b/swarms/memory/sqlite.py @@ -1,5 +1,5 @@ from typing import List, Tuple, Any, Optional -from swarms.memory.base_vectordb import AbstractDatabase +from swarms.memory.base_vectordb import AbstractVectorDatabase try: import sqlite3 @@ -9,7 +9,7 @@ except ImportError: ) -class SQLiteDB(AbstractDatabase): +class SQLiteDB(AbstractVectorDatabase): """ A reusable class for SQLite database operations with methods for adding, deleting, updating, and querying data. diff --git a/swarms/memory/weaviate_db.py b/swarms/memory/weaviate_db.py index fec1199e..05ad5388 100644 --- a/swarms/memory/weaviate_db.py +++ b/swarms/memory/weaviate_db.py @@ -4,7 +4,7 @@ Weaviate API Client from typing import Any, Dict, List, Optional -from swarms.memory.base_vectordb import AbstractDatabase +from swarms.memory.base_vectordb import AbstractVectorDatabase try: import weaviate @@ -12,7 +12,7 @@ except ImportError: print("pip install weaviate-client") -class WeaviateDB(AbstractDatabase): +class WeaviateDB(AbstractVectorDatabase): """ Weaviate API Client diff --git a/swarms/structs/agent.py b/swarms/structs/agent.py index a5173482..61f0dd1e 100644 --- a/swarms/structs/agent.py +++ b/swarms/structs/agent.py @@ -83,7 +83,7 @@ class Agent: pdf_path (str): The path to the pdf list_of_pdf (str): The list of pdf tokenizer (Any): The tokenizer - memory (AbstractDatabase): The memory + memory (AbstractVectorDatabase): The memory preset_stopping_token (bool): Enable preset stopping token traceback (Any): The traceback traceback_handlers (Any): The traceback handlers @@ -168,7 +168,7 @@ class Agent: pdf_path: Optional[str] = None, list_of_pdf: Optional[str] = None, tokenizer: Optional[Any] = None, - long_term_memory: Optional[AbstractDatabase] = None, + long_term_memory: Optional[AbstractVectorDatabase] = None, preset_stopping_token: Optional[bool] = False, traceback: Any = None, traceback_handlers: Any = None,