From 2c4184b81e4bb6c26dae2266e9905dfcd5249db3 Mon Sep 17 00:00:00 2001
From: SwiftyOS <craigswift13@gmail.com>
Date: Wed, 6 Dec 2023 15:34:08 +0100
Subject: [PATCH] Forge: Moved memory and llm out of the sdk

---
 autogpts/forge/forge/agent.py                            | 6 +-----
 autogpts/forge/forge/{sdk => }/llm.py                    | 2 +-
 autogpts/forge/forge/{sdk => }/memory/__init__.py        | 0
 autogpts/forge/forge/{sdk => }/memory/chroma_memstore.py | 0
 autogpts/forge/forge/{sdk => }/memory/memstore.py        | 0
 autogpts/forge/forge/{sdk => }/memory/memstore_test.py   | 0
 autogpts/forge/forge/sdk/__init__.py                     | 4 +---
 7 files changed, 3 insertions(+), 9 deletions(-)
 rename autogpts/forge/forge/{sdk => }/llm.py (98%)
 rename autogpts/forge/forge/{sdk => }/memory/__init__.py (100%)
 rename autogpts/forge/forge/{sdk => }/memory/chroma_memstore.py (100%)
 rename autogpts/forge/forge/{sdk => }/memory/memstore.py (100%)
 rename autogpts/forge/forge/{sdk => }/memory/memstore_test.py (100%)

diff --git a/autogpts/forge/forge/agent.py b/autogpts/forge/forge/agent.py
index 5c9d1359..9f242f0c 100644
--- a/autogpts/forge/forge/agent.py
+++ b/autogpts/forge/forge/agent.py
@@ -7,13 +7,9 @@ from forge.sdk import (
     Task,
     TaskRequestBody,
     Workspace,
-    PromptEngine,
-    chat_completion_request,
-    ChromaMemStore,
 )
 from forge.actions import ActionRegister
-import json
-import pprint
+
 
 LOG = ForgeLogger(__name__)
 
diff --git a/autogpts/forge/forge/sdk/llm.py b/autogpts/forge/forge/llm.py
similarity index 98%
rename from autogpts/forge/forge/sdk/llm.py
rename to autogpts/forge/forge/llm.py
index 9be2afb4..23639a6d 100644
--- a/autogpts/forge/forge/sdk/llm.py
+++ b/autogpts/forge/forge/llm.py
@@ -3,7 +3,7 @@ import typing
 import openai
 from tenacity import retry, stop_after_attempt, wait_random_exponential
 
-from .forge_log import ForgeLogger
+from .sdk.forge_log import ForgeLogger
 from litellm import completion, acompletion, AuthenticationError, InvalidRequestError
 
 LOG = ForgeLogger(__name__)
diff --git a/autogpts/forge/forge/sdk/memory/__init__.py b/autogpts/forge/forge/memory/__init__.py
similarity index 100%
rename from autogpts/forge/forge/sdk/memory/__init__.py
rename to autogpts/forge/forge/memory/__init__.py
diff --git a/autogpts/forge/forge/sdk/memory/chroma_memstore.py b/autogpts/forge/forge/memory/chroma_memstore.py
similarity index 100%
rename from autogpts/forge/forge/sdk/memory/chroma_memstore.py
rename to autogpts/forge/forge/memory/chroma_memstore.py
diff --git a/autogpts/forge/forge/sdk/memory/memstore.py b/autogpts/forge/forge/memory/memstore.py
similarity index 100%
rename from autogpts/forge/forge/sdk/memory/memstore.py
rename to autogpts/forge/forge/memory/memstore.py
diff --git a/autogpts/forge/forge/sdk/memory/memstore_test.py b/autogpts/forge/forge/memory/memstore_test.py
similarity index 100%
rename from autogpts/forge/forge/sdk/memory/memstore_test.py
rename to autogpts/forge/forge/memory/memstore_test.py
diff --git a/autogpts/forge/forge/sdk/__init__.py b/autogpts/forge/forge/sdk/__init__.py
index 12515eff..366464f9 100644
--- a/autogpts/forge/forge/sdk/__init__.py
+++ b/autogpts/forge/forge/sdk/__init__.py
@@ -5,7 +5,7 @@ core of the Forge.
 from .agent import Agent
 from .db import AgentDB, Base
 from .forge_log import ForgeLogger
-from .llm import chat_completion_request, create_embedding_request, transcribe_audio
+from ..llm import chat_completion_request, create_embedding_request, transcribe_audio
 from .prompting import PromptEngine
 from .model import (
     Artifact,
@@ -23,5 +23,3 @@ from .model import (
 )
 from .workspace import LocalWorkspace, Workspace
 from .errors import *
-from .memory.chroma_memstore import ChromaMemStore
-from .memory.memstore import MemStore