letta-nightly 0.1.7.dev20240925104133__tar.gz → 0.1.7.dev20240926104108__tar.gz

{letta_nightly-0.1.7.dev20240925104133 → letta_nightly-0.1.7.dev20240926104108}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: letta-nightly
-Version: 0.1.7.dev20240925104133
+Version: 0.1.7.dev20240926104108
 Summary: Create LLM agents with long-term memory and custom tools
 License: Apache License
 Author: Letta Team
@@ -73,17 +73,17 @@ Description-Content-Type: text/markdown
 
 # Letta (previously MemGPT)
 [![Discord](https://img.shields.io/discord/1161736243340640419?label=Discord&logo=discord&logoColor=5865F2&style=flat-square&color=5865F2)](https://discord.gg/letta)
-[![Twitter Follow](https://img.shields.io/badge/follow-%40Letta-1DA1F2?style=flat-square&logo=x&logoColor=white)](https://twitter.com/Letta_AI)
+[![Twitter Follow](https://img.shields.io/badge/follow-%40Letta_AI-1DA1F2?style=flat-square&logo=x&logoColor=white)](https://twitter.com/Letta_AI)
 [![arxiv 2310.08560](https://img.shields.io/badge/arXiv-2310.08560-B31B1B?logo=arxiv&style=flat-square)](https://arxiv.org/abs/2310.08560)
 
-> [!NOTE]  
+> [!NOTE]
 > **Looking for MemGPT?**
-> 
+>
 > The MemGPT package and Docker image have been renamed to `letta` to clarify the distinction between **MemGPT agents** and the API server / runtime that runs LLM agents as *services*.
-> 
+>
 > You use the **Letta framework** to create **MemGPT agents**. Read more about the relationship between MemGPT and Letta [here](https://www.letta.com/blog/memgpt-and-letta).
 
-See [documentation](https://docs.letta.com/introduction) for setup and usage. 
+See [documentation](https://docs.letta.com/introduction) for setup and usage.
 
 ## How to Get Involved
 * **Contribute to the Project**: Interested in contributing? Start by reading our [Contribution Guidelines](https://github.com/cpacker/MemGPT/tree/main/CONTRIBUTING.md).

{letta_nightly-0.1.7.dev20240925104133 → letta_nightly-0.1.7.dev20240926104108}/README.md

@@ -1,16 +1,16 @@
 # Letta (previously MemGPT)
 [![Discord](https://img.shields.io/discord/1161736243340640419?label=Discord&logo=discord&logoColor=5865F2&style=flat-square&color=5865F2)](https://discord.gg/letta)
-[![Twitter Follow](https://img.shields.io/badge/follow-%40Letta-1DA1F2?style=flat-square&logo=x&logoColor=white)](https://twitter.com/Letta_AI)
+[![Twitter Follow](https://img.shields.io/badge/follow-%40Letta_AI-1DA1F2?style=flat-square&logo=x&logoColor=white)](https://twitter.com/Letta_AI)
 [![arxiv 2310.08560](https://img.shields.io/badge/arXiv-2310.08560-B31B1B?logo=arxiv&style=flat-square)](https://arxiv.org/abs/2310.08560)
 
-> [!NOTE]  
+> [!NOTE]
 > **Looking for MemGPT?**
-> 
+>
 > The MemGPT package and Docker image have been renamed to `letta` to clarify the distinction between **MemGPT agents** and the API server / runtime that runs LLM agents as *services*.
-> 
+>
 > You use the **Letta framework** to create **MemGPT agents**. Read more about the relationship between MemGPT and Letta [here](https://www.letta.com/blog/memgpt-and-letta).
 
-See [documentation](https://docs.letta.com/introduction) for setup and usage. 
+See [documentation](https://docs.letta.com/introduction) for setup and usage.
 
 ## How to Get Involved
 * **Contribute to the Project**: Interested in contributing? Start by reading our [Contribution Guidelines](https://github.com/cpacker/MemGPT/tree/main/CONTRIBUTING.md).

{letta_nightly-0.1.7.dev20240925104133 → letta_nightly-0.1.7.dev20240926104108}/letta/cli/cli.py

@@ -492,7 +492,7 @@ def run(
         # agent_config = AgentConfig.load(agent)
         # agent_state = ms.get_agent(agent_name=agent, user_id=user_id)
         printd("Loading agent state:", agent_state.id)
-        printd("Agent state:", agent_state.state)
+        printd("Agent state:", agent_state.name)
         # printd("State path:", agent_config.save_state_dir())
         # printd("Persistent manager path:", agent_config.save_persistence_manager_dir())
         # printd("Index path:", agent_config.save_agent_index_dir())
@@ -549,6 +549,7 @@ def run(
         )
 
         # create agent
+        tools = [ms.get_tool(tool_name, user_id=client.user_id) for tool_name in agent_state.tools]
         letta_agent = Agent(agent_state=agent_state, interface=interface(), tools=tools)
 
     else:  # create new agent

{letta_nightly-0.1.7.dev20240925104133 → letta_nightly-0.1.7.dev20240926104108}/letta/client/client.py

@@ -5,7 +5,6 @@ from typing import Callable, Dict, Generator, List, Optional, Union
 import requests
 
 import letta.utils
-from letta.config import LettaConfig
 from letta.constants import BASE_TOOLS, DEFAULT_HUMAN, DEFAULT_PERSONA
 from letta.data_sources.connectors import DataConnector
 from letta.functions.functions import parse_source_code
@@ -42,7 +41,6 @@ from letta.schemas.openai.chat_completions import ToolCall
 from letta.schemas.passage import Passage
 from letta.schemas.source import Source, SourceCreate, SourceUpdate
 from letta.schemas.tool import Tool, ToolCreate, ToolUpdate
-from letta.schemas.user import UserCreate
 from letta.server.rest_api.interface import QueuingInterface
 from letta.server.server import SyncServer
 from letta.utils import get_human_text, get_persona_text
@@ -1112,6 +1110,7 @@ class RESTClient(AbstractClient):
         params = {"agent_id": str(agent_id)}
         response = requests.post(f"{self.base_url}/{self.api_prefix}/sources/{source_id}/detach", params=params, headers=self.headers)
         assert response.status_code == 200, f"Failed to detach source from agent: {response.text}"
+        return Source(**response.json())
 
     # server configuration commands
 
@@ -2084,7 +2083,8 @@ class LocalClient(AbstractClient):
         Returns:
             job (Job): Data loading job including job status and metadata
         """
-        job = self.server.create_job(user_id=self.user_id)
+        metadata_ = {"type": "embedding", "filename": filename, "source_id": source_id}
+        job = self.server.create_job(user_id=self.user_id, metadata=metadata_)
 
         # TODO: implement blocking vs. non-blocking
         self.server.load_file_to_source(source_id=source_id, file_path=filename, job_id=job.id)
@@ -2159,7 +2159,16 @@ class LocalClient(AbstractClient):
         self.server.attach_source_to_agent(source_id=source_id, source_name=source_name, agent_id=agent_id, user_id=self.user_id)
 
     def detach_source_from_agent(self, agent_id: str, source_id: Optional[str] = None, source_name: Optional[str] = None):
-        self.server.detach_source_from_agent(source_id=source_id, source_name=source_name, agent_id=agent_id, user_id=self.user_id)
+        """
+        Detach a source from an agent by removing all `Passage` objects that were loaded from the source from archival memory.
+        Args:
+            agent_id (str): ID of the agent
+            source_id (str): ID of the source
+            source_name (str): Name of the source
+        Returns:
+            source (Source): Detached source
+        """
+        return self.server.detach_source_from_agent(source_id=source_id, source_name=source_name, agent_id=agent_id, user_id=self.user_id)
 
     def list_sources(self) -> List[Source]:
         """

{letta_nightly-0.1.7.dev20240925104133 → letta_nightly-0.1.7.dev20240926104108}/letta/llm_api/llm_api_tools.py

@@ -313,6 +313,7 @@ def create(
         if "inference.memgpt.ai" in llm_config.model_endpoint:
             # override user id for inference.memgpt.ai
             import uuid
+
             data.user = str(uuid.UUID(int=0))
 
         if stream:  # Client requested token streaming

{letta_nightly-0.1.7.dev20240925104133 → letta_nightly-0.1.7.dev20240926104108}/letta/schemas/job.py

@@ -10,7 +10,7 @@ from letta.utils import get_utc_time
 
 class JobBase(LettaBase):
     __id_prefix__ = "job"
-    metadata_: Optional[dict] = Field({}, description="The metadata of the job.")
+    metadata_: Optional[dict] = Field(None, description="The metadata of the job.")
 
 
 class Job(JobBase):

{letta_nightly-0.1.7.dev20240925104133 → letta_nightly-0.1.7.dev20240926104108}/letta/schemas/llm_config.py

@@ -43,7 +43,7 @@ class LLMConfig(BaseModel):
                 model_wrapper=None,
                 context_window=128000,
             )
-        elif model_name == "letta": 
+        elif model_name == "letta":
             return cls(
                 model="memgpt-openai",
                 model_endpoint_type="openai",

{letta_nightly-0.1.7.dev20240925104133 → letta_nightly-0.1.7.dev20240926104108}/letta/server/rest_api/app.py

@@ -1,10 +1,8 @@
 import json
 import logging
-import secrets
 from pathlib import Path
 from typing import Optional
 
-import typer
 import uvicorn
 from fastapi import FastAPI, Request
 from fastapi.responses import JSONResponse

{letta_nightly-0.1.7.dev20240925104133 → letta_nightly-0.1.7.dev20240926104108}/letta/server/rest_api/routers/v1/jobs.py

@@ -1,6 +1,6 @@
-from typing import List
+from typing import List, Optional
 
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter, Depends, Query
 
 from letta.schemas.job import Job
 from letta.server.rest_api.utils import get_letta_server
@@ -12,6 +12,7 @@ router = APIRouter(prefix="/jobs", tags=["jobs"])
 @router.get("/", response_model=List[Job], operation_id="list_jobs")
 def list_jobs(
     server: "SyncServer" = Depends(get_letta_server),
+    source_id: Optional[str] = Query(None, description="Only list jobs associated with the source."),
 ):
     """
     List all jobs.
@@ -19,7 +20,14 @@ def list_jobs(
     actor = server.get_current_user()
 
     # TODO: add filtering by status
-    return server.list_jobs(user_id=actor.id)
+    jobs = server.list_jobs(user_id=actor.id)
+
+    # TODO: eventually use ORM
+    # results = session.query(JobModel).filter(JobModel.user_id == user_id, JobModel.metadata_["source_id"].astext == sourced_id).all()
+    if source_id:
+        # can't be in the ORM since we have source_id stored in the metadata_
+        jobs = [job for job in jobs if job.metadata_.get("source_id") == source_id]
+    return jobs
 
 
 @router.get("/active", response_model=List[Job], operation_id="list_active_jobs")

{letta_nightly-0.1.7.dev20240925104133 → letta_nightly-0.1.7.dev20240926104108}/letta/server/rest_api/routers/v1/sources.py

@@ -114,7 +114,7 @@ def attach_source_to_agent(
     return source
 
 
-@router.post("/{source_id}/detach", response_model=None, operation_id="detach_agent_from_source")
+@router.post("/{source_id}/detach", response_model=Source, operation_id="detach_agent_from_source")
 def detach_source_from_agent(
     source_id: str,
     agent_id: str = Query(..., description="The unique identifier of the agent to detach the source from."),
@@ -125,7 +125,7 @@ def detach_source_from_agent(
     """
     actor = server.get_current_user()
 
-    server.detach_source_from_agent(source_id=source_id, agent_id=agent_id, user_id=actor.id)
+    return server.detach_source_from_agent(source_id=source_id, agent_id=agent_id, user_id=actor.id)
 
 
 @router.post("/{source_id}/upload", response_model=Job, operation_id="upload_file_to_source")

{letta_nightly-0.1.7.dev20240925104133 → letta_nightly-0.1.7.dev20240926104108}/letta/server/server.py

@@ -6,7 +6,7 @@ import traceback
 import warnings
 from abc import abstractmethod
 from datetime import datetime
-from typing import Callable, List, Optional, Tuple, Union
+from typing import Callable, Dict, List, Optional, Tuple, Union
 
 from fastapi import HTTPException
 
@@ -1043,7 +1043,7 @@ class SyncServer(Server):
             existing_block = existing_blocks[0]
             assert len(existing_blocks) == 1
             if update:
-                return self.update_block(UpdateBlock(id=existing_block.id, **vars(request)), user_id)
+                return self.update_block(UpdateBlock(id=existing_block.id, **vars(request)))
             else:
                 raise ValueError(f"Block with name {request.name} already exists")
         block = Block(**vars(request))
@@ -1513,11 +1513,12 @@ class SyncServer(Server):
 
         # TODO: delete data from agent passage stores (?)
 
-    def create_job(self, user_id: str) -> Job:
+    def create_job(self, user_id: str, metadata: Optional[Dict] = None) -> Job:
         """Create a new job"""
         job = Job(
             user_id=user_id,
             status=JobStatus.created,
+            metadata_=metadata,
         )
         self.ms.create_job(job)
         return job
@@ -1627,8 +1628,18 @@ class SyncServer(Server):
         source_id: Optional[str] = None,
         source_name: Optional[str] = None,
     ) -> Source:
-        # TODO: remove all passages coresponding to source from agent's archival memory
-        raise NotImplementedError
+        if not source_id:
+            assert source_name is not None, "source_name must be provided if source_id is not"
+            source = self.ms.get_source(source_name=source_name, user_id=user_id)
+            source_id = source.id
+        else:
+            source = self.ms.get_source(source_id=source_id)
+
+        # delete all Passage objects with source_id==source_id from agent's archival memory
+        agent = self._get_or_load_agent(agent_id=agent_id)
+        archival_memory = agent.persistence_manager.archival_memory
+        archival_memory.storage.delete({"source_id": source_id})
+        return source
 
     def list_attached_sources(self, agent_id: str) -> List[Source]:
         # list all attached sources to an agent
@@ -1963,18 +1974,18 @@ class SyncServer(Server):
 
         return self.get_default_user()
         ## NOTE: same code as local client to get the default user
-        #config = LettaConfig.load()
-        #user_id = config.anon_clientid
-        #user = self.get_user(user_id)
+        # config = LettaConfig.load()
+        # user_id = config.anon_clientid
+        # user = self.get_user(user_id)
 
-        #if not user:
+        # if not user:
         #    user = self.create_user(UserCreate())
 
         #    # # update config
         #    config.anon_clientid = str(user.id)
         #    config.save()
 
-        #return user
+        # return user
 
     def list_models(self) -> List[LLMConfig]:
         """List available models"""

{letta_nightly-0.1.7.dev20240925104133 → letta_nightly-0.1.7.dev20240926104108}/letta/settings.py

@@ -1,6 +1,6 @@
+import os
 from pathlib import Path
 from typing import Optional
-import os
 
 from pydantic import Field
 from pydantic_settings import BaseSettings, SettingsConfigDict
@@ -64,11 +64,12 @@ class Settings(BaseSettings):
         if self.llm_model:
             try:
                 return LLMConfig.default_config(self.llm_model)
-            except ValueError as e:
+            except ValueError:
                 pass
 
         # try to read from config file (last resort)
         from letta.config import LettaConfig
+
         if LettaConfig.exists():
             config = LettaConfig.load()
             llm_config = LLMConfig(
@@ -79,12 +80,12 @@ class Settings(BaseSettings):
                 context_window=config.default_llm_config.context_window,
             )
             return llm_config
-    
+
         # check OpenAI API key
-        if os.getenv("OPENAI_API_KEY"): 
+        if os.getenv("OPENAI_API_KEY"):
             return LLMConfig.default_config(self.llm_model if self.llm_model else "gpt-4")
 
-        return LLMConfig.default_config("letta")        
+        return LLMConfig.default_config("letta")
 
     @property
     def embedding_config(self):
@@ -118,6 +119,7 @@ class Settings(BaseSettings):
 
         # try to read from config file (last resort)
         from letta.config import LettaConfig
+
         if LettaConfig.exists():
             config = LettaConfig.load()
             return EmbeddingConfig(
@@ -127,10 +129,10 @@ class Settings(BaseSettings):
                 embedding_dim=config.default_embedding_config.embedding_dim,
                 embedding_chunk_size=config.default_embedding_config.embedding_chunk_size,
             )
-        
+
         if os.getenv("OPENAI_API_KEY"):
             return EmbeddingConfig.default_config(self.embedding_model if self.embedding_model else "text-embedding-ada-002")
-        
+
         return EmbeddingConfig.default_config("letta")
 
     @property
@@ -161,5 +163,5 @@ class TestSettings(Settings):
 
 
 # singleton
-settings = Settings(_env_parse_none_str='None')
+settings = Settings(_env_parse_none_str="None")
 test_settings = TestSettings()

{letta_nightly-0.1.7.dev20240925104133 → letta_nightly-0.1.7.dev20240926104108}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "letta-nightly"
-version = "0.1.7.dev20240925104133"
+version = "0.1.7.dev20240926104108"
 packages = [
     {include = "letta"}
 ]