Create new merged Storage

.gitignore

@@ -23,6 +23,7 @@
 # Ignore .envrc files (used by direnv: https://direnv.net/)
 .envrc
 
+certs/
 
 # ignore storage dir
 /storage
@@ -62,4 +63,4 @@ token.json
 
 # Coverage
 coverage_report
-.coverage
+.coverage

cookbook/README.md

@@ -12,7 +12,7 @@ The concepts cookbook walks through the core concepts of Agno.
 - [RAG](./agent_concepts/rag)
 - [Knowledge](./agent_concepts/knowledge)
 - [Memory](./agent_concepts/memory)
-- [Storage](./agent_concepts/storage)
+- [Storage](storage)
 - [Tools](./agent_concepts/tools)
 - [Reasoning](./agent_concepts/reasoning)
 - [Vector DBs](./agent_concepts/vector_dbs)

cookbook/examples/agents/agno_support_agent.py

@@ -31,7 +31,6 @@
 from agno.knowledge.url import UrlKnowledge
 from agno.models.openai import OpenAIChat
 from agno.storage.agent.sqlite import SqliteAgentStorage
-from agno.tools.duckduckgo import DuckDuckGoTools
 from agno.tools.python import PythonTools
 from agno.vectordb.lancedb import LanceDb, SearchType
 from rich import print

cookbook/getting_started/04_agent_with_storage.py

@@ -23,7 +23,7 @@
 from agno.embedder.openai import OpenAIEmbedder
 from agno.knowledge.pdf_url import PDFUrlKnowledgeBase
 from agno.models.openai import OpenAIChat
-from agno.storage.agent.sqlite import SqliteAgentStorage
+from agno.storage.sqlite import SqliteStorage
 from agno.tools.duckduckgo import DuckDuckGoTools
 from agno.vectordb.lancedb import LanceDb, SearchType
 from rich import print
@@ -41,7 +41,7 @@
 # if agent_knowledge is not None:
 #     agent_knowledge.load()
 
-agent_storage = SqliteAgentStorage(table_name="recipe_agent", db_file="tmp/agents.db")
+agent_storage = SqliteStorage(table_name="recipe_agent", db_file="tmp/agents.db")
 
 
 def recipe_agent(user: str = "user"):

cookbook/getting_started/09_research_workflow.py

@@ -26,7 +26,7 @@
 
 from agno.agent import Agent
 from agno.models.openai import OpenAIChat
-from agno.storage.workflow.sqlite import SqliteWorkflowStorage
+from agno.storage.sqlite import SqliteStorage
 from agno.tools.duckduckgo import DuckDuckGoTools
 from agno.tools.newspaper4k import Newspaper4kTools
 from agno.utils.log import logger
@@ -408,7 +408,7 @@ def write_research_report(
     # Initialize the news report generator workflow
     generate_research_report = ResearchReportGenerator(
         session_id=f"generate-report-on-{url_safe_topic}",
-        storage=SqliteWorkflowStorage(
+        storage=SqliteStorage(
             table_name="generate_research_report_workflow",
             db_file="tmp/workflows.db",
         ),

cookbook/getting_started/16_agent_session.py

@@ -17,7 +17,7 @@
 import typer
 from agno.agent import Agent
 from agno.models.openai import OpenAIChat
-from agno.storage.agent.sqlite import SqliteAgentStorage
+from agno.storage.sqlite import SqliteStorage
 from rich import print
 from rich.console import Console
 from rich.json import JSON
@@ -34,9 +34,7 @@ def create_agent(user: str = "user"):
     new = typer.confirm("Do you want to start a new session?")
 
     # Get existing session if user doesn't want a new one
-    agent_storage = SqliteAgentStorage(
-        table_name="agent_sessions", db_file="tmp/agents.db"
-    )
+    agent_storage = SqliteStorage(table_name="agent_sessions", db_file="tmp/agents.db")
 
     if not new:
         existing_sessions = agent_storage.get_all_session_ids(user)

cookbook/getting_started/17_user_memories_and_summaries.py

@@ -29,7 +29,7 @@
 from agno.agent import Agent, AgentMemory
 from agno.memory.db.sqlite import SqliteMemoryDb
 from agno.models.openai import OpenAIChat
-from agno.storage.agent.sqlite import SqliteAgentStorage
+from agno.storage.sqlite import SqliteStorage
 from rich.console import Console
 from rich.json import JSON
 from rich.panel import Panel
@@ -43,9 +43,7 @@ def create_agent(user: str = "user"):
     new = typer.confirm("Do you want to start a new session?")
 
     # Initialize storage for both agent sessions and memories
-    agent_storage = SqliteAgentStorage(
-        table_name="agent_memories", db_file="tmp/agents.db"
-    )
+    agent_storage = SqliteStorage(table_name="agent_memories", db_file="tmp/agents.db")
 
     if not new:
         existing_sessions = agent_storage.get_all_session_ids(user)

cookbook/hackathon/playground/blog_to_podcast.py

@@ -9,7 +9,7 @@
 from agno.agent import Agent
 from agno.models.openai import OpenAIChat
 from agno.playground import Playground, serve_playground_app
-from agno.storage.agent.sqlite import SqliteAgentStorage
+from agno.storage.sqlite import SqliteStorage
 from agno.tools.eleven_labs import ElevenLabsTools
 from agno.tools.firecrawl import FirecrawlTools
 
@@ -43,7 +43,7 @@
     markdown=True,
     debug_mode=True,
     add_history_to_messages=True,
-    storage=SqliteAgentStorage(
+    storage=SqliteStorage(
         table_name="blog_to_podcast_agent", db_file=image_agent_storage_file
     ),
 )

cookbook/hackathon/playground/demo.py

@@ -1,15 +1,11 @@
 """Run `pip install openai exa_py duckduckgo-search yfinance pypdf sqlalchemy 'fastapi[standard]' youtube-transcript-api python-docx agno` to install dependencies."""
 
-from datetime import datetime
-from textwrap import dedent
-
 from agno.agent import Agent
 from agno.models.openai import OpenAIChat
 from agno.playground import Playground, serve_playground_app
-from agno.storage.agent.sqlite import SqliteAgentStorage
+from agno.storage.sqlite import SqliteStorage
 from agno.tools.dalle import DalleTools
 from agno.tools.duckduckgo import DuckDuckGoTools
-from agno.tools.exa import ExaTools
 from agno.tools.yfinance import YFinanceTools
 from agno.tools.youtube import YouTubeTools
 
@@ -22,7 +18,7 @@
     role="Answer basic questions",
     agent_id="simple-agent",
     model=OpenAIChat(id="gpt-4o-mini"),
-    storage=SqliteAgentStorage(table_name="simple_agent", db_file=agent_storage_file),
+    storage=SqliteStorage(table_name="simple_agent", db_file=agent_storage_file),
     add_history_to_messages=True,
     num_history_responses=3,
     add_datetime_to_instructions=True,
@@ -39,7 +35,7 @@
         "Break down the users request into 2-3 different searches.",
         "Always include sources",
     ],
-    storage=SqliteAgentStorage(table_name="web_agent", db_file=agent_storage_file),
+    storage=SqliteStorage(table_name="web_agent", db_file=agent_storage_file),
     add_history_to_messages=True,
     num_history_responses=5,
     add_datetime_to_instructions=True,
@@ -60,7 +56,7 @@
         )
     ],
     instructions=["Always use tables to display data"],
-    storage=SqliteAgentStorage(table_name="finance_agent", db_file=agent_storage_file),
+    storage=SqliteStorage(table_name="finance_agent", db_file=agent_storage_file),
     add_history_to_messages=True,
     num_history_responses=5,
     add_datetime_to_instructions=True,
@@ -81,9 +77,7 @@
     debug_mode=True,
     add_history_to_messages=True,
     add_datetime_to_instructions=True,
-    storage=SqliteAgentStorage(
-        table_name="image_agent", db_file=image_agent_storage_file
-    ),
+    storage=SqliteStorage(table_name="image_agent", db_file=image_agent_storage_file),
 )
 
 youtube_agent = Agent(
@@ -102,7 +96,7 @@
     num_history_responses=5,
     show_tool_calls=True,
     add_datetime_to_instructions=True,
-    storage=SqliteAgentStorage(table_name="youtube_agent", db_file=agent_storage_file),
+    storage=SqliteStorage(table_name="youtube_agent", db_file=agent_storage_file),
     markdown=True,
 )
 

cookbook/hackathon/playground/multimodal_agents.py

@@ -10,7 +10,7 @@
 from agno.models.openai import OpenAIChat
 from agno.models.response import FileType
 from agno.playground import Playground, serve_playground_app
-from agno.storage.agent.sqlite import SqliteAgentStorage
+from agno.storage.sqlite import SqliteStorage
 from agno.tools.dalle import DalleTools
 from agno.tools.eleven_labs import ElevenLabsTools
 from agno.tools.fal import FalTools
@@ -33,9 +33,7 @@
     debug_mode=True,
     add_history_to_messages=True,
     add_datetime_to_instructions=True,
-    storage=SqliteAgentStorage(
-        table_name="image_agent", db_file=image_agent_storage_file
-    ),
+    storage=SqliteStorage(table_name="image_agent", db_file=image_agent_storage_file),
 )
 
 ml_gif_agent = Agent(
@@ -52,9 +50,7 @@
     debug_mode=True,
     add_history_to_messages=True,
     add_datetime_to_instructions=True,
-    storage=SqliteAgentStorage(
-        table_name="ml_gif_agent", db_file=image_agent_storage_file
-    ),
+    storage=SqliteStorage(table_name="ml_gif_agent", db_file=image_agent_storage_file),
 )
 
 ml_music_agent = Agent(
@@ -78,7 +74,7 @@
     debug_mode=True,
     add_history_to_messages=True,
     add_datetime_to_instructions=True,
-    storage=SqliteAgentStorage(
+    storage=SqliteStorage(
         table_name="ml_music_agent", db_file=image_agent_storage_file
     ),
 )
@@ -97,7 +93,7 @@
     debug_mode=True,
     add_history_to_messages=True,
     add_datetime_to_instructions=True,
-    storage=SqliteAgentStorage(
+    storage=SqliteStorage(
         table_name="ml_video_agent", db_file=image_agent_storage_file
     ),
 )
@@ -116,9 +112,7 @@
     debug_mode=True,
     add_history_to_messages=True,
     add_datetime_to_instructions=True,
-    storage=SqliteAgentStorage(
-        table_name="fal_agent", db_file=image_agent_storage_file
-    ),
+    storage=SqliteStorage(table_name="fal_agent", db_file=image_agent_storage_file),
 )
 
 gif_agent = Agent(
@@ -135,9 +129,7 @@
     debug_mode=True,
     add_history_to_messages=True,
     add_datetime_to_instructions=True,
-    storage=SqliteAgentStorage(
-        table_name="gif_agent", db_file=image_agent_storage_file
-    ),
+    storage=SqliteStorage(table_name="gif_agent", db_file=image_agent_storage_file),
 )
 
 audio_agent = Agent(
@@ -163,9 +155,7 @@
     debug_mode=True,
     add_history_to_messages=True,
     add_datetime_to_instructions=True,
-    storage=SqliteAgentStorage(
-        table_name="audio_agent", db_file=image_agent_storage_file
-    ),
+    storage=SqliteStorage(table_name="audio_agent", db_file=image_agent_storage_file),
 )
 
 

cookbook/models/anthropic/memory.py

@@ -9,8 +9,7 @@
 from agno.agent import Agent, AgentMemory
 from agno.memory.db.postgres import PgMemoryDb
 from agno.models.anthropic import Claude
-from agno.storage.agent.postgres import PostgresAgentStorage
-from rich.pretty import pprint
+from agno.storage.postgres import PostgresStorage
 
 db_url = "postgresql+psycopg://ai:ai@localhost:5532/ai"
 agent = Agent(
@@ -22,9 +21,7 @@
         create_session_summary=True,
     ),
     # Store agent sessions in a database
-    storage=PostgresAgentStorage(
-        table_name="personalized_agent_sessions", db_url=db_url
-    ),
+    storage=PostgresStorage(table_name="personalized_agent_sessions", db_url=db_url),
     # Show debug logs so, you can see the memory being created
     # debug_mode=True,
 )

cookbook/models/anthropic/storage.py

@@ -2,14 +2,14 @@
 
 from agno.agent import Agent
 from agno.models.anthropic import Claude
-from agno.storage.agent.postgres import PostgresAgentStorage
+from agno.storage.postgres import PostgresStorage
 from agno.tools.duckduckgo import DuckDuckGoTools
 
 db_url = "postgresql+psycopg://ai:ai@localhost:5532/ai"
 
 agent = Agent(
     model=Claude(id="claude-3-5-sonnet-20241022"),
-    storage=PostgresAgentStorage(table_name="agent_sessions", db_url=db_url),
+    storage=PostgresStorage(table_name="agent_sessions", db_url=db_url),
     tools=[DuckDuckGoTools()],
     add_history_to_messages=True,
 )

cookbook/models/aws/claude/storage.py

@@ -2,14 +2,14 @@
 
 from agno.agent import Agent
 from agno.models.aws import Claude
-from agno.storage.agent.postgres import PostgresAgentStorage
+from agno.storage.postgres import PostgresStorage
 from agno.tools.duckduckgo import DuckDuckGoTools
 
 db_url = "postgresql+psycopg://ai:ai@localhost:5532/ai"
 
 agent = Agent(
     model=Claude(id="anthropic.claude-3-5-sonnet-20240620-v1:0"),
-    storage=PostgresAgentStorage(table_name="agent_sessions", db_url=db_url),
+    storage=PostgresStorage(table_name="agent_sessions", db_url=db_url),
     tools=[DuckDuckGoTools()],
     add_history_to_messages=True,
 )

cookbook/models/azure/ai_foundry/storage.py

@@ -2,14 +2,14 @@
 
 from agno.agent import Agent
 from agno.models.azure import AzureAIFoundry
-from agno.storage.agent.postgres import PostgresAgentStorage
+from agno.storage.postgres import PostgresStorage
 from agno.tools.duckduckgo import DuckDuckGoTools
 
 db_url = "postgresql+psycopg://ai:ai@localhost:5532/ai"
 
 agent = Agent(
     model=AzureAIFoundry(id="Phi-4"),
-    storage=PostgresAgentStorage(table_name="agent_sessions", db_url=db_url),
+    storage=PostgresStorage(table_name="agent_sessions", db_url=db_url),
     tools=[DuckDuckGoTools()],
     add_history_to_messages=True,
 )

cookbook/models/azure/openai/storage.py

@@ -2,14 +2,14 @@
 
 from agno.agent import Agent
 from agno.models.azure import AzureOpenAI
-from agno.storage.agent.postgres import PostgresAgentStorage
+from agno.storage.postgres import PostgresStorage
 from agno.tools.duckduckgo import DuckDuckGoTools
 
 db_url = "postgresql+psycopg://ai:ai@localhost:5532/ai"
 
 agent = Agent(
     model=AzureOpenAI(id="gpt-4o-mini"),
-    storage=PostgresAgentStorage(table_name="agent_sessions", db_url=db_url),
+    storage=PostgresStorage(table_name="agent_sessions", db_url=db_url),
     tools=[DuckDuckGoTools()],
     add_history_to_messages=True,
 )

cookbook/models/cohere/memory.py

@@ -9,7 +9,7 @@
 from agno.agent import Agent, AgentMemory
 from agno.memory.db.postgres import PgMemoryDb
 from agno.models.cohere import Cohere
-from agno.storage.agent.postgres import PostgresAgentStorage
+from agno.storage.postgres import PostgresStorage
 
 db_url = "postgresql+psycopg://ai:ai@localhost:5532/ai"
 agent = Agent(
@@ -21,9 +21,7 @@
         create_session_summary=True,
     ),
     # Store agent sessions in a database
-    storage=PostgresAgentStorage(
-        table_name="personalized_agent_sessions", db_url=db_url
-    ),
+    storage=PostgresStorage(table_name="personalized_agent_sessions", db_url=db_url),
     # Show debug logs so, you can see the memory being created
     # debug_mode=True,
 )

cookbook/models/cohere/storage.py

@@ -2,14 +2,14 @@
 
 from agno.agent import Agent
 from agno.models.cohere import Cohere
-from agno.storage.agent.postgres import PostgresAgentStorage
+from agno.storage.postgres import PostgresStorage
 from agno.tools.duckduckgo import DuckDuckGoTools
 
 db_url = "postgresql+psycopg://ai:ai@localhost:5532/ai"
 
 agent = Agent(
     model=Cohere(id="command-r-08-2024"),
-    storage=PostgresAgentStorage(table_name="agent_sessions", db_url=db_url),
+    storage=PostgresStorage(table_name="agent_sessions", db_url=db_url),
     tools=[DuckDuckGoTools()],
     add_history_to_messages=True,
 )