The Memory Layer for AI Agents - Drop-in memory infrastructure for AI agents and apps. Context that persists. Built for production.
Python agentic-memoryagentic-memory-systemagentsaiai-agentschatgptgenaillmlong-term-memorymemorymemory-managementpythonragstate-management
[chore]: Rename modules for better readability and maintainability (#587)
Deshraj Yadav79f5a1d0529e
diff --git a/docs/advanced/app_types.mdx b/docs/advanced/app_types.mdxindex 757fb0585..7b094e598 100644--- a/docs/advanced/app_types.mdx+++ b/docs/advanced/app_types.mdx@@ -71,10 +71,10 @@ app = OpenSourceApp()from embedchain import CustomAppfrom embedchain.config import (CustomAppConfig, ElasticsearchDBConfig,EmbedderConfig, LlmConfig)-from embedchain.embedder.vertexai_embedder import VertexAiEmbedder-from embedchain.llm.vertex_ai_llm import VertexAiLlm+from embedchain.embedder.vertexai import VertexAiEmbedder+from embedchain.llm.vertex_ai import VertexAiLlmfrom embedchain.models import EmbeddingFunctions, Providers-from embedchain.vectordb.elasticsearch_db import Elasticsearch+from embedchain.vectordb.elasticsearch import Elasticsearch# shortapp = CustomApp(llm=VertexAiLlm(), db=Elasticsearch(), embedder=VertexAiEmbedder())diff --git a/embedchain/__init__.py b/embedchain/__init__.pyindex e0891bdbb..0cea3f4fe 100644--- a/embedchain/__init__.py+++ b/embedchain/__init__.py@@ -6,5 +6,6 @@ from embedchain.apps.App import App # noqa: F401from embedchain.apps.CustomApp import CustomApp # noqa: F401from embedchain.apps.Llama2App import Llama2App # noqa: F401from embedchain.apps.OpenSourceApp import OpenSourceApp # noqa: F401-from embedchain.apps.PersonApp import PersonApp, PersonOpenSourceApp # noqa: F401-from embedchain.vectordb.chroma_db import ChromaDB # noqa: F401+from embedchain.apps.PersonApp import (PersonApp, # noqa: F401+ PersonOpenSourceApp)+from embedchain.vectordb.chroma import ChromaDB # noqa: F401diff --git a/embedchain/apps/App.py b/embedchain/apps/App.pyindex 87602ed0e..d8dc65599 100644--- a/embedchain/apps/App.py+++ b/embedchain/apps/App.py@@ -3,10 +3,10 @@ from typing import Optionalfrom embedchain.config import (AppConfig, BaseEmbedderConfig, BaseLlmConfig,ChromaDbConfig)from embedchain.embedchain import EmbedChain-from embedchain.embedder.openai_embedder import OpenAiEmbedder-from embedchain.helper_classes.json_serializable import register_deserializable-from embedchain.llm.openai_llm import OpenAiLlm-from embedchain.vectordb.chroma_db import ChromaDB+from embedchain.embedder.openai import OpenAiEmbedder+from embedchain.helper.json_serializable import register_deserializable+from embedchain.llm.openai import OpenAILlm+from embedchain.vectordb.chroma import ChromaDB@register_deserializable@@ -47,7 +47,7 @@ class App(EmbedChain):if config is None:config = AppConfig()- llm = OpenAiLlm(config=llm_config)+ llm = OpenAILlm(config=llm_config)embedder = OpenAiEmbedder(config=BaseEmbedderConfig(model="text-embedding-ada-002"))database = ChromaDB(config=chromadb_config)diff --git a/embedchain/apps/CustomApp.py b/embedchain/apps/CustomApp.pyindex b8aa7d3b3..875027bfb 100644--- a/embedchain/apps/CustomApp.py+++ b/embedchain/apps/CustomApp.py@@ -2,10 +2,10 @@ from typing import Optionalfrom embedchain.config import CustomAppConfigfrom embedchain.embedchain import EmbedChain-from embedchain.embedder.base_embedder import BaseEmbedder-from embedchain.helper_classes.json_serializable import register_deserializable-from embedchain.llm.base_llm import BaseLlm-from embedchain.vectordb.base_vector_db import BaseVectorDB+from embedchain.embedder.base import BaseEmbedder+from embedchain.helper.json_serializable import register_deserializable+from embedchain.llm.base import BaseLlm+from embedchain.vectordb.base import BaseVectorDB@register_deserializable@@ -35,7 +35,7 @@ class CustomApp(EmbedChain)::param config: Config for the app instance. This is the most basic configuration,that does not fall into the LLM, database or embedder category, defaults to None:type config: Optional[CustomAppConfig], optional- :param llm: LLM Class instance. example: `from embedchain.llm.openai_llm import OpenAiLlm`, defaults to None+ :param llm: LLM Class instance. example: `from embedchain.llm.openai import OpenAILlm`, defaults to None:type llm: BaseLlm:param db: The database to use for storing and retrieving embeddings,example: `from embedchain.vectordb.chroma_db import ChromaDb`, defaults to Nonediff --git a/embedchain/apps/Llama2App.py b/embedchain/apps/Llama2App.pyindex a62148bab..2319f573c 100644--- a/embedchain/apps/Llama2App.py+++ b/embedchain/apps/Llama2App.py@@ -2,10 +2,10 @@ from typing import Optionalfrom embedchain.apps.CustomApp import CustomAppfrom embedchain.config import CustomAppConfig-from embedchain.embedder.openai_embedder import OpenAiEmbedder-from embedchain.helper_classes.json_serializable import register_deserializable-from embedchain.llm.llama2_llm import Llama2Llm-from embedchain.vectordb.chroma_db import ChromaDB+from embedchain.embedder.openai import OpenAiEmbedder+from embedchain.helper.json_serializable import register_deserializable+from embedchain.llm.llama2 import Llama2Llm+from embedchain.vectordb.chroma import ChromaDB@register_deserializablediff --git a/embedchain/apps/OpenSourceApp.py b/embedchain/apps/OpenSourceApp.pyindex f6d126734..80ece5678 100644--- a/embedchain/apps/OpenSourceApp.py+++ b/embedchain/apps/OpenSourceApp.py@@ -4,10 +4,10 @@ from typing import Optionalfrom embedchain.config import (BaseEmbedderConfig, BaseLlmConfig,ChromaDbConfig, OpenSourceAppConfig)from embedchain.embedchain import EmbedChain-from embedchain.embedder.gpt4all_embedder import GPT4AllEmbedder-from embedchain.helper_classes.json_serializable import register_deserializable-from embedchain.llm.gpt4all_llm import GPT4ALLLlm-from embedchain.vectordb.chroma_db import ChromaDB+from embedchain.embedder.gpt4all import GPT4AllEmbedder+from embedchain.helper.json_serializable import register_deserializable+from embedchain.llm.gpt4all import GPT4ALLLlm+from embedchain.vectordb.chroma import ChromaDBgpt4all_model = Nonediff --git a/embedchain/apps/PersonApp.py b/embedchain/apps/PersonApp.pyindex de15be2d4..bfc3a7ac9 100644--- a/embedchain/apps/PersonApp.py+++ b/embedchain/apps/PersonApp.py@@ -6,7 +6,7 @@ from embedchain.config import BaseLlmConfigfrom embedchain.config.apps.BaseAppConfig import BaseAppConfigfrom embedchain.config.llm.base_llm_config import (DEFAULT_PROMPT,DEFAULT_PROMPT_WITH_HISTORY)-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializable@register_deserializablediff --git a/embedchain/bots/base.py b/embedchain/bots/base.pyindex 2ac81748c..60b69b015 100644--- a/embedchain/bots/base.py+++ b/embedchain/bots/base.py@@ -2,17 +2,17 @@ from typing import Anyfrom embedchain import CustomAppfrom embedchain.config import AddConfig, CustomAppConfig, LlmConfig-from embedchain.embedder.openai_embedder import OpenAiEmbedder-from embedchain.helper_classes.json_serializable import (- JSONSerializable, register_deserializable)-from embedchain.llm.openai_llm import OpenAiLlm-from embedchain.vectordb.chroma_db import ChromaDB+from embedchain.embedder.openai import OpenAiEmbedder+from embedchain.helper.json_serializable import (JSONSerializable,+ register_deserializable)+from embedchain.llm.openai import OpenAILlm+from embedchain.vectordb.chroma import ChromaDB@register_deserializableclass BaseBot(JSONSerializable):def __init__(self):- self.app = CustomApp(config=CustomAppConfig(), llm=OpenAiLlm(), db=ChromaDB(), embedder=OpenAiEmbedder())+ self.app = CustomApp(config=CustomAppConfig(), llm=OpenAILlm(), db=ChromaDB(), embedder=OpenAiEmbedder())def add(self, data: Any, config: AddConfig = None):"""diff --git a/embedchain/bots/discord.py b/embedchain/bots/discord.pyindex fd6716ec3..d2984982d 100644--- a/embedchain/bots/discord.py+++ b/embedchain/bots/discord.py@@ -6,7 +6,7 @@ import discordfrom discord import app_commandsfrom discord.ext import commands-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializablefrom .base import BaseBotdiff --git a/embedchain/bots/poe.py b/embedchain/bots/poe.pyindex 17938217a..58e82bfb7 100644--- a/embedchain/bots/poe.py+++ b/embedchain/bots/poe.py@@ -5,7 +5,7 @@ from typing import List, Optionalfrom fastapi_poe import PoeBot, run-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializablefrom .base import BaseBotdiff --git a/embedchain/bots/slack.py b/embedchain/bots/slack.pyindex a00ec8b05..21834d8d4 100644--- a/embedchain/bots/slack.py+++ b/embedchain/bots/slack.py@@ -5,7 +5,7 @@ import signalimport sysfrom embedchain import App-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializablefrom .base import BaseBotdiff --git a/embedchain/bots/whatsapp.py b/embedchain/bots/whatsapp.pyindex 4cdd1a94c..c9193f6f6 100644--- a/embedchain/bots/whatsapp.py+++ b/embedchain/bots/whatsapp.py@@ -4,7 +4,7 @@ import loggingimport signalimport sys-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializablefrom .base import BaseBotdiff --git a/embedchain/chunkers/base_chunker.py b/embedchain/chunkers/base_chunker.pyindex 2a926d3e0..3787ff5b5 100644--- a/embedchain/chunkers/base_chunker.py+++ b/embedchain/chunkers/base_chunker.py@@ -1,6 +1,6 @@import hashlib-from embedchain.helper_classes.json_serializable import JSONSerializable+from embedchain.helper.json_serializable import JSONSerializablefrom embedchain.models.data_type import DataTypediff --git a/embedchain/chunkers/docs_site.py b/embedchain/chunkers/docs_site.pyindex e5ea879fb..27f5b3880 100644--- a/embedchain/chunkers/docs_site.py+++ b/embedchain/chunkers/docs_site.py@@ -4,7 +4,7 @@ from langchain.text_splitter import RecursiveCharacterTextSplitterfrom embedchain.chunkers.base_chunker import BaseChunkerfrom embedchain.config.AddConfig import ChunkerConfig-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializable@register_deserializablediff --git a/embedchain/chunkers/docx_file.py b/embedchain/chunkers/docx_file.pyindex 51935d848..9fd233170 100644--- a/embedchain/chunkers/docx_file.py+++ b/embedchain/chunkers/docx_file.py@@ -4,7 +4,7 @@ from langchain.text_splitter import RecursiveCharacterTextSplitterfrom embedchain.chunkers.base_chunker import BaseChunkerfrom embedchain.config.AddConfig import ChunkerConfig-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializable@register_deserializablediff --git a/embedchain/chunkers/notion.py b/embedchain/chunkers/notion.pyindex 5b473e0fa..6edc3824c 100644--- a/embedchain/chunkers/notion.py+++ b/embedchain/chunkers/notion.py@@ -4,7 +4,7 @@ from langchain.text_splitter import RecursiveCharacterTextSplitterfrom embedchain.chunkers.base_chunker import BaseChunkerfrom embedchain.config.AddConfig import ChunkerConfig-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializable@register_deserializablediff --git a/embedchain/chunkers/pdf_file.py b/embedchain/chunkers/pdf_file.pyindex 1a4825538..b89ad1f94 100644--- a/embedchain/chunkers/pdf_file.py+++ b/embedchain/chunkers/pdf_file.py@@ -4,7 +4,7 @@ from langchain.text_splitter import RecursiveCharacterTextSplitterfrom embedchain.chunkers.base_chunker import BaseChunkerfrom embedchain.config.AddConfig import ChunkerConfig-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializable@register_deserializablediff --git a/embedchain/chunkers/qna_pair.py b/embedchain/chunkers/qna_pair.pyindex 451ac010c..bc30119c7 100644--- a/embedchain/chunkers/qna_pair.py+++ b/embedchain/chunkers/qna_pair.py@@ -4,7 +4,7 @@ from langchain.text_splitter import RecursiveCharacterTextSplitterfrom embedchain.chunkers.base_chunker import BaseChunkerfrom embedchain.config.AddConfig import ChunkerConfig-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializable@register_deserializablediff --git a/embedchain/chunkers/text.py b/embedchain/chunkers/text.pyindex 0329d959d..cda7c2640 100644--- a/embedchain/chunkers/text.py+++ b/embedchain/chunkers/text.py@@ -4,7 +4,7 @@ from langchain.text_splitter import RecursiveCharacterTextSplitterfrom embedchain.chunkers.base_chunker import BaseChunkerfrom embedchain.config.AddConfig import ChunkerConfig-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializable@register_deserializablediff --git a/embedchain/chunkers/web_page.py b/embedchain/chunkers/web_page.pyindex 395cf250d..af1845c7f 100644--- a/embedchain/chunkers/web_page.py+++ b/embedchain/chunkers/web_page.py@@ -4,7 +4,7 @@ from langchain.text_splitter import RecursiveCharacterTextSplitterfrom embedchain.chunkers.base_chunker import BaseChunkerfrom embedchain.config.AddConfig import ChunkerConfig-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializable@register_deserializablediff --git a/embedchain/chunkers/youtube_video.py b/embedchain/chunkers/youtube_video.pyindex 41d27b0f4..852bf804f 100644--- a/embedchain/chunkers/youtube_video.py+++ b/embedchain/chunkers/youtube_video.py@@ -4,7 +4,7 @@ from langchain.text_splitter import RecursiveCharacterTextSplitterfrom embedchain.chunkers.base_chunker import BaseChunkerfrom embedchain.config.AddConfig import ChunkerConfig-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializable@register_deserializablediff --git a/embedchain/config/AddConfig.py b/embedchain/config/AddConfig.pyindex 09eea5a7c..db16170d6 100644--- a/embedchain/config/AddConfig.py+++ b/embedchain/config/AddConfig.py@@ -1,7 +1,7 @@from typing import Callable, Optionalfrom embedchain.config.BaseConfig import BaseConfig-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializable@register_deserializablediff --git a/embedchain/config/BaseConfig.py b/embedchain/config/BaseConfig.pyindex 5a269b65e..b02801f47 100644--- a/embedchain/config/BaseConfig.py+++ b/embedchain/config/BaseConfig.py@@ -1,6 +1,6 @@from typing import Any, Dict-from embedchain.helper_classes.json_serializable import JSONSerializable+from embedchain.helper.json_serializable import JSONSerializableclass BaseConfig(JSONSerializable):diff --git a/embedchain/config/apps/AppConfig.py b/embedchain/config/apps/AppConfig.pyindex a7ead3b6b..0833ccdf1 100644--- a/embedchain/config/apps/AppConfig.py+++ b/embedchain/config/apps/AppConfig.py@@ -1,6 +1,6 @@from typing import Optional-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializablefrom .BaseAppConfig import BaseAppConfigdiff --git a/embedchain/config/apps/BaseAppConfig.py b/embedchain/config/apps/BaseAppConfig.pyindex f36d97524..4a76153b6 100644--- a/embedchain/config/apps/BaseAppConfig.py+++ b/embedchain/config/apps/BaseAppConfig.py@@ -2,8 +2,8 @@ import loggingfrom typing import Optionalfrom embedchain.config.BaseConfig import BaseConfig-from embedchain.helper_classes.json_serializable import JSONSerializable-from embedchain.vectordb.base_vector_db import BaseVectorDB+from embedchain.helper.json_serializable import JSONSerializable+from embedchain.vectordb.base import BaseVectorDBclass BaseAppConfig(BaseConfig, JSONSerializable):diff --git a/embedchain/config/apps/CustomAppConfig.py b/embedchain/config/apps/CustomAppConfig.pyindex ca2ede28a..4795dc319 100644--- a/embedchain/config/apps/CustomAppConfig.py+++ b/embedchain/config/apps/CustomAppConfig.py@@ -2,8 +2,8 @@ from typing import Optionalfrom dotenv import load_dotenv-from embedchain.helper_classes.json_serializable import register_deserializable-from embedchain.vectordb.base_vector_db import BaseVectorDB+from embedchain.helper.json_serializable import register_deserializable+from embedchain.vectordb.base import BaseVectorDBfrom .BaseAppConfig import BaseAppConfigdiff --git a/embedchain/config/apps/OpenSourceAppConfig.py b/embedchain/config/apps/OpenSourceAppConfig.pyindex 7a8be7a38..c8c50c15e 100644--- a/embedchain/config/apps/OpenSourceAppConfig.py+++ b/embedchain/config/apps/OpenSourceAppConfig.py@@ -1,6 +1,6 @@from typing import Optional-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializablefrom .BaseAppConfig import BaseAppConfigdiff --git a/embedchain/config/embedder/BaseEmbedderConfig.py b/embedchain/config/embedder/BaseEmbedderConfig.pyindex 5370fc27b..8e8501e74 100644--- a/embedchain/config/embedder/BaseEmbedderConfig.py+++ b/embedchain/config/embedder/BaseEmbedderConfig.py@@ -1,6 +1,6 @@from typing import Optional-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializable@register_deserializablediff --git a/embedchain/config/llm/base_llm_config.py b/embedchain/config/llm/base_llm_config.pyindex 4e31a5721..6cf145fae 100644--- a/embedchain/config/llm/base_llm_config.py+++ b/embedchain/config/llm/base_llm_config.py@@ -3,7 +3,7 @@ from string import Templatefrom typing import Any, Dict, Optionalfrom embedchain.config.BaseConfig import BaseConfig-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializableDEFAULT_PROMPT = """Use the following pieces of context to answer the query at the end.diff --git a/embedchain/config/vectordbs/ChromaDbConfig.py b/embedchain/config/vectordbs/ChromaDbConfig.pyindex bc2ecfad1..a1b32559c 100644--- a/embedchain/config/vectordbs/ChromaDbConfig.py+++ b/embedchain/config/vectordbs/ChromaDbConfig.py@@ -1,7 +1,7 @@from typing import Optionalfrom embedchain.config.vectordbs.BaseVectorDbConfig import BaseVectorDbConfig-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializable@register_deserializablediff --git a/embedchain/config/vectordbs/ElasticsearchDBConfig.py b/embedchain/config/vectordbs/ElasticsearchDBConfig.pyindex f7c2a7439..1a0d0a87e 100644--- a/embedchain/config/vectordbs/ElasticsearchDBConfig.py+++ b/embedchain/config/vectordbs/ElasticsearchDBConfig.py@@ -1,7 +1,7 @@from typing import Dict, List, Optional, Unionfrom embedchain.config.vectordbs.BaseVectorDbConfig import BaseVectorDbConfig-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializable@register_deserializablediff --git a/embedchain/data_formatter/data_formatter.py b/embedchain/data_formatter/data_formatter.pyindex 13a2ec45b..e8db93d1f 100644--- a/embedchain/data_formatter/data_formatter.py+++ b/embedchain/data_formatter/data_formatter.py@@ -10,7 +10,7 @@ from embedchain.chunkers.web_page import WebPageChunkerfrom embedchain.chunkers.youtube_video import YoutubeVideoChunkerfrom embedchain.config import AddConfigfrom embedchain.config.AddConfig import ChunkerConfig, LoaderConfig-from embedchain.helper_classes.json_serializable import JSONSerializable+from embedchain.helper.json_serializable import JSONSerializablefrom embedchain.loaders.base_loader import BaseLoaderfrom embedchain.loaders.csv import CsvLoaderfrom embedchain.loaders.docs_site_loader import DocsSiteLoaderdiff --git a/embedchain/embedchain.py b/embedchain/embedchain.pyindex d47a65c1c..d9daefa4f 100644--- a/embedchain/embedchain.py+++ b/embedchain/embedchain.py@@ -16,13 +16,13 @@ from embedchain.chunkers.base_chunker import BaseChunkerfrom embedchain.config import AddConfig, BaseLlmConfigfrom embedchain.config.apps.BaseAppConfig import BaseAppConfigfrom embedchain.data_formatter import DataFormatter-from embedchain.embedder.base_embedder import BaseEmbedder-from embedchain.helper_classes.json_serializable import JSONSerializable-from embedchain.llm.base_llm import BaseLlm+from embedchain.embedder.base import BaseEmbedder+from embedchain.helper.json_serializable import JSONSerializable+from embedchain.llm.base import BaseLlmfrom embedchain.loaders.base_loader import BaseLoaderfrom embedchain.models.data_type import DataTypefrom embedchain.utils import detect_datatype-from embedchain.vectordb.base_vector_db import BaseVectorDB+from embedchain.vectordb.base import BaseVectorDBload_dotenv()diff --git a/embedchain/embedder/base_embedder.py b/embedchain/embedder/base.pysimilarity index 100%rename from embedchain/embedder/base_embedder.pyrename to embedchain/embedder/base.pydiff --git a/embedchain/embedder/gpt4all_embedder.py b/embedchain/embedder/gpt4all.pysimilarity index 93%rename from embedchain/embedder/gpt4all_embedder.pyrename to embedchain/embedder/gpt4all.pyindex 9b06393ab..5c443d564 100644--- a/embedchain/embedder/gpt4all_embedder.py+++ b/embedchain/embedder/gpt4all.py@@ -3,7 +3,7 @@ from typing import Optionalfrom chromadb.utils import embedding_functionsfrom embedchain.config import BaseEmbedderConfig-from embedchain.embedder.base_embedder import BaseEmbedder+from embedchain.embedder.base import BaseEmbedderfrom embedchain.models import EmbeddingFunctionsdiff --git a/embedchain/embedder/huggingface_embedder.py b/embedchain/embedder/huggingface.pysimilarity index 91%rename from embedchain/embedder/huggingface_embedder.pyrename to embedchain/embedder/huggingface.pyindex 9565ad54e..d0ffabfdf 100644--- a/embedchain/embedder/huggingface_embedder.py+++ b/embedchain/embedder/huggingface.py@@ -3,7 +3,7 @@ from typing import Optionalfrom langchain.embeddings import HuggingFaceEmbeddingsfrom embedchain.config import BaseEmbedderConfig-from embedchain.embedder.base_embedder import BaseEmbedder+from embedchain.embedder.base import BaseEmbedderfrom embedchain.models import EmbeddingFunctionsdiff --git a/embedchain/embedder/openai_embedder.py b/embedchain/embedder/openai.pysimilarity index 96%rename from embedchain/embedder/openai_embedder.pyrename to embedchain/embedder/openai.pyindex b174c6a6b..6480e9b20 100644--- a/embedchain/embedder/openai_embedder.py+++ b/embedchain/embedder/openai.py@@ -4,7 +4,7 @@ from typing import Optionalfrom langchain.embeddings import OpenAIEmbeddingsfrom embedchain.config import BaseEmbedderConfig-from embedchain.embedder.base_embedder import BaseEmbedder+from embedchain.embedder.base import BaseEmbedderfrom embedchain.models import EmbeddingFunctionstry:diff --git a/embedchain/embedder/vertexai_embedder.py b/embedchain/embedder/vertexai.pysimilarity index 91%rename from embedchain/embedder/vertexai_embedder.pyrename to embedchain/embedder/vertexai.pyindex 891de5bb3..f03eda7b8 100644--- a/embedchain/embedder/vertexai_embedder.py+++ b/embedchain/embedder/vertexai.py@@ -3,7 +3,7 @@ from typing import Optionalfrom langchain.embeddings import VertexAIEmbeddingsfrom embedchain.config import BaseEmbedderConfig-from embedchain.embedder.base_embedder import BaseEmbedder+from embedchain.embedder.base import BaseEmbedderfrom embedchain.models import EmbeddingFunctionsdiff --git a/embedchain/helper_classes/json_serializable.py b/embedchain/helper/json_serializable.pysimilarity index 100%rename from embedchain/helper_classes/json_serializable.pyrename to embedchain/helper/json_serializable.pydiff --git a/embedchain/llm/antrophic_llm.py b/embedchain/llm/antrophic.pysimilarity index 87%rename from embedchain/llm/antrophic_llm.pyrename to embedchain/llm/antrophic.pyindex 90950fa6d..041a45c96 100644--- a/embedchain/llm/antrophic_llm.py+++ b/embedchain/llm/antrophic.py@@ -2,8 +2,8 @@ import loggingfrom typing import Optionalfrom embedchain.config import BaseLlmConfig-from embedchain.helper_classes.json_serializable import register_deserializable-from embedchain.llm.base_llm import BaseLlm+from embedchain.helper.json_serializable import register_deserializable+from embedchain.llm.base import BaseLlm@register_deserializablediff --git a/embedchain/llm/azure_openai_llm.py b/embedchain/llm/azure_openai.pysimilarity index 83%rename from embedchain/llm/azure_openai_llm.pyrename to embedchain/llm/azure_openai.pyindex 40703446a..7d9b2f8f5 100644--- a/embedchain/llm/azure_openai_llm.py+++ b/embedchain/llm/azure_openai.py@@ -2,17 +2,17 @@ import loggingfrom typing import Optionalfrom embedchain.config import BaseLlmConfig-from embedchain.helper_classes.json_serializable import register_deserializable-from embedchain.llm.base_llm import BaseLlm+from embedchain.helper.json_serializable import register_deserializable+from embedchain.llm.base import BaseLlm@register_deserializable-class AzureOpenAiLlm(BaseLlm):+class AzureOpenAILlm(BaseLlm):def __init__(self, config: Optional[BaseLlmConfig] = None):super().__init__(config=config)def get_llm_model_answer(self, prompt):- return AzureOpenAiLlm._get_azure_openai_answer(prompt=prompt, config=self.config)+ return AzureOpenAILlm._get_azure_openai_answer(prompt=prompt, config=self.config)@staticmethoddef _get_azure_openai_answer(prompt: str, config: BaseLlmConfig) -> str:diff --git a/embedchain/llm/base_llm.py b/embedchain/llm/base.pysimilarity index 99%rename from embedchain/llm/base_llm.pyrename to embedchain/llm/base.pyindex 451bd1474..486c66e4f 100644--- a/embedchain/llm/base_llm.py+++ b/embedchain/llm/base.py@@ -8,7 +8,7 @@ from embedchain.config import BaseLlmConfigfrom embedchain.config.llm.base_llm_config import (DEFAULT_PROMPT, DEFAULT_PROMPT_WITH_HISTORY_TEMPLATE,DOCS_SITE_PROMPT_TEMPLATE)-from embedchain.helper_classes.json_serializable import JSONSerializable+from embedchain.helper.json_serializable import JSONSerializableclass BaseLlm(JSONSerializable):diff --git a/embedchain/llm/gpt4all_llm.py b/embedchain/llm/gpt4all.pysimilarity index 92%rename from embedchain/llm/gpt4all_llm.pyrename to embedchain/llm/gpt4all.pyindex d08ea91f5..48fd844b1 100644--- a/embedchain/llm/gpt4all_llm.py+++ b/embedchain/llm/gpt4all.py@@ -1,8 +1,8 @@from typing import Iterable, Optional, Unionfrom embedchain.config import BaseLlmConfig-from embedchain.helper_classes.json_serializable import register_deserializable-from embedchain.llm.base_llm import BaseLlm+from embedchain.helper.json_serializable import register_deserializable+from embedchain.llm.base import BaseLlm@register_deserializablediff --git a/embedchain/llm/llama2_llm.py b/embedchain/llm/llama2.pysimilarity index 88%rename from embedchain/llm/llama2_llm.pyrename to embedchain/llm/llama2.pyindex 42ec1eff2..689585891 100644--- a/embedchain/llm/llama2_llm.py+++ b/embedchain/llm/llama2.py@@ -4,8 +4,8 @@ from typing import Optionalfrom langchain.llms import Replicatefrom embedchain.config import BaseLlmConfig-from embedchain.helper_classes.json_serializable import register_deserializable-from embedchain.llm.base_llm import BaseLlm+from embedchain.helper.json_serializable import register_deserializable+from embedchain.llm.base import BaseLlm@register_deserializablediff --git a/embedchain/llm/openai_llm.py b/embedchain/llm/openai.pysimilarity index 89%rename from embedchain/llm/openai_llm.pyrename to embedchain/llm/openai.pyindex f22b271fd..d21cfb6b7 100644--- a/embedchain/llm/openai_llm.py+++ b/embedchain/llm/openai.py@@ -3,12 +3,12 @@ from typing import Optionalimport openaifrom embedchain.config import BaseLlmConfig-from embedchain.helper_classes.json_serializable import register_deserializable-from embedchain.llm.base_llm import BaseLlm+from embedchain.helper.json_serializable import register_deserializable+from embedchain.llm.base import BaseLlm@register_deserializable-class OpenAiLlm(BaseLlm):+class OpenAILlm(BaseLlm):def __init__(self, config: Optional[BaseLlmConfig] = None):super().__init__(config=config)diff --git a/embedchain/llm/vertex_ai_llm.py b/embedchain/llm/vertex_ai.pysimilarity index 87%rename from embedchain/llm/vertex_ai_llm.pyrename to embedchain/llm/vertex_ai.pyindex a5a9927a0..b6224e0c3 100644--- a/embedchain/llm/vertex_ai_llm.py+++ b/embedchain/llm/vertex_ai.py@@ -2,8 +2,8 @@ import loggingfrom typing import Optionalfrom embedchain.config import BaseLlmConfig-from embedchain.helper_classes.json_serializable import register_deserializable-from embedchain.llm.base_llm import BaseLlm+from embedchain.helper.json_serializable import register_deserializable+from embedchain.llm.base import BaseLlm@register_deserializablediff --git a/embedchain/loaders/base_loader.py b/embedchain/loaders/base_loader.pyindex c0861f885..bba58b813 100644--- a/embedchain/loaders/base_loader.py+++ b/embedchain/loaders/base_loader.py@@ -1,4 +1,4 @@-from embedchain.helper_classes.json_serializable import JSONSerializable+from embedchain.helper.json_serializable import JSONSerializableclass BaseLoader(JSONSerializable):diff --git a/embedchain/loaders/docs_site_loader.py b/embedchain/loaders/docs_site_loader.pyindex 06d351d85..11c9758e5 100644--- a/embedchain/loaders/docs_site_loader.py+++ b/embedchain/loaders/docs_site_loader.py@@ -4,7 +4,7 @@ from urllib.parse import urljoin, urlparseimport requestsfrom bs4 import BeautifulSoup-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializablefrom embedchain.loaders.base_loader import BaseLoaderdiff --git a/embedchain/loaders/docx_file.py b/embedchain/loaders/docx_file.pyindex c657d78b8..5ea1931b3 100644--- a/embedchain/loaders/docx_file.py+++ b/embedchain/loaders/docx_file.py@@ -1,6 +1,6 @@from langchain.document_loaders import Docx2txtLoader-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializablefrom embedchain.loaders.base_loader import BaseLoaderdiff --git a/embedchain/loaders/local_qna_pair.py b/embedchain/loaders/local_qna_pair.pyindex 4fd1571ab..5130f1845 100644--- a/embedchain/loaders/local_qna_pair.py+++ b/embedchain/loaders/local_qna_pair.py@@ -1,4 +1,4 @@-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializablefrom embedchain.loaders.base_loader import BaseLoaderdiff --git a/embedchain/loaders/local_text.py b/embedchain/loaders/local_text.pyindex 92e26a9eb..80b13d291 100644--- a/embedchain/loaders/local_text.py+++ b/embedchain/loaders/local_text.py@@ -1,4 +1,4 @@-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializablefrom embedchain.loaders.base_loader import BaseLoaderdiff --git a/embedchain/loaders/notion.py b/embedchain/loaders/notion.pyindex b9f894df0..ad6c93a62 100644--- a/embedchain/loaders/notion.py+++ b/embedchain/loaders/notion.py@@ -9,7 +9,7 @@ except ImportError:) from None-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializablefrom embedchain.loaders.base_loader import BaseLoaderfrom embedchain.utils import clean_stringdiff --git a/embedchain/loaders/pdf_file.py b/embedchain/loaders/pdf_file.pyindex 7844b1453..4084299fc 100644--- a/embedchain/loaders/pdf_file.py+++ b/embedchain/loaders/pdf_file.py@@ -1,6 +1,6 @@from langchain.document_loaders import PyPDFLoader-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializablefrom embedchain.loaders.base_loader import BaseLoaderfrom embedchain.utils import clean_stringdiff --git a/embedchain/loaders/sitemap.py b/embedchain/loaders/sitemap.pyindex 3a9109b8e..555cbe721 100644--- a/embedchain/loaders/sitemap.py+++ b/embedchain/loaders/sitemap.py@@ -4,7 +4,7 @@ import requestsfrom bs4 import BeautifulSoupfrom bs4.builder import ParserRejectedMarkup-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializablefrom embedchain.loaders.base_loader import BaseLoaderfrom embedchain.loaders.web_page import WebPageLoaderfrom embedchain.utils import is_readablediff --git a/embedchain/loaders/web_page.py b/embedchain/loaders/web_page.pyindex cc562499a..9b6b8d940 100644--- a/embedchain/loaders/web_page.py+++ b/embedchain/loaders/web_page.py@@ -3,7 +3,7 @@ import loggingimport requestsfrom bs4 import BeautifulSoup-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializablefrom embedchain.loaders.base_loader import BaseLoaderfrom embedchain.utils import clean_stringdiff --git a/embedchain/loaders/youtube_video.py b/embedchain/loaders/youtube_video.pyindex af36fba07..7a6060647 100644--- a/embedchain/loaders/youtube_video.py+++ b/embedchain/loaders/youtube_video.py@@ -1,6 +1,6 @@from langchain.document_loaders import YoutubeLoader-from embedchain.helper_classes.json_serializable import register_deserializable+from embedchain.helper.json_serializable import register_deserializablefrom embedchain.loaders.base_loader import BaseLoaderfrom embedchain.utils import clean_stringdiff --git a/embedchain/vectordb/base_vector_db.py b/embedchain/vectordb/base.pysimilarity index 94%rename from embedchain/vectordb/base_vector_db.pyrename to embedchain/vectordb/base.pyindex 8fa0ec74a..b877ab0b6 100644--- a/embedchain/vectordb/base_vector_db.py+++ b/embedchain/vectordb/base.py@@ -1,6 +1,6 @@from embedchain.config.vectordbs.BaseVectorDbConfig import BaseVectorDbConfig-from embedchain.embedder.base_embedder import BaseEmbedder-from embedchain.helper_classes.json_serializable import JSONSerializable+from embedchain.embedder.base import BaseEmbedder+from embedchain.helper.json_serializable import JSONSerializableclass BaseVectorDB(JSONSerializable):diff --git a/embedchain/vectordb/chroma_db.py b/embedchain/vectordb/chroma.pysimilarity index 98%rename from embedchain/vectordb/chroma_db.pyrename to embedchain/vectordb/chroma.pyindex de7a928c9..84f458404 100644--- a/embedchain/vectordb/chroma_db.py+++ b/embedchain/vectordb/chroma.py@@ -5,8 +5,8 @@ from chromadb import Collection, QueryResultfrom langchain.docstore.document import Documentfrom embedchain.config import ChromaDbConfig-from embedchain.helper_classes.json_serializable import register_deserializable-from embedchain.vectordb.base_vector_db import BaseVectorDB+from embedchain.helper.json_serializable import register_deserializable+from embedchain.vectordb.base import BaseVectorDBtry:import chromadbdiff --git a/embedchain/vectordb/elasticsearch_db.py b/embedchain/vectordb/elasticsearch.pysimilarity index 95%rename from embedchain/vectordb/elasticsearch_db.pyrename to embedchain/vectordb/elasticsearch.pyindex 2125e7012..f03c0b349 100644--- a/embedchain/vectordb/elasticsearch_db.py+++ b/embedchain/vectordb/elasticsearch.py@@ -9,8 +9,8 @@ except ImportError:) from Nonefrom embedchain.config import ElasticsearchDBConfig-from embedchain.helper_classes.json_serializable import register_deserializable-from embedchain.vectordb.base_vector_db import BaseVectorDB+from embedchain.helper.json_serializable import register_deserializable+from embedchain.vectordb.base import BaseVectorDB@register_deserializablediff --git a/pyproject.toml b/pyproject.tomlindex 1f3a07c2f..afa1113a7 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -1,6 +1,6 @@[tool.poetry]name = "embedchain"-version = "0.0.54"+version = "0.0.55"description = "embedchain is a framework to easily create LLM powered bots over any dataset"authors = ["Taranjeet Singh"]license = "Apache License"diff --git a/tests/embedchain/test_embedchain.py b/tests/embedchain/test_embedchain.pyindex 86ad452ec..8122c61a0 100644--- a/tests/embedchain/test_embedchain.py+++ b/tests/embedchain/test_embedchain.py@@ -12,8 +12,8 @@ class TestChromaDbHostsLoglevel(unittest.TestCase):@patch("chromadb.api.models.Collection.Collection.add")@patch("chromadb.api.models.Collection.Collection.get")@patch("embedchain.embedchain.EmbedChain.retrieve_from_database")- @patch("embedchain.llm.base_llm.BaseLlm.get_answer_from_llm")- @patch("embedchain.llm.base_llm.BaseLlm.get_llm_model_answer")+ @patch("embedchain.llm.base.BaseLlm.get_answer_from_llm")+ @patch("embedchain.llm.base.BaseLlm.get_llm_model_answer")def test_whole_app(self,_mock_get,diff --git a/tests/helper_classes/test_json_serializable.py b/tests/helper_classes/test_json_serializable.pyindex 36b0f0458..c99bfd3ec 100644--- a/tests/helper_classes/test_json_serializable.py+++ b/tests/helper_classes/test_json_serializable.py@@ -3,8 +3,8 @@ import unittestfrom embedchain import Appfrom embedchain.config import AppConfig-from embedchain.helper_classes.json_serializable import (- JSONSerializable, register_deserializable)+from embedchain.helper.json_serializable import (JSONSerializable,+ register_deserializable)class TestJsonSerializable(unittest.TestCase):diff --git a/tests/llm/test_chat.py b/tests/llm/test_chat.pyindex a5340b079..6bffd23fc 100644--- a/tests/llm/test_chat.py+++ b/tests/llm/test_chat.py@@ -4,7 +4,7 @@ from unittest.mock import MagicMock, patchfrom embedchain import Appfrom embedchain.config import AppConfig, BaseLlmConfig-from embedchain.llm.base_llm import BaseLlm+from embedchain.llm.base import BaseLlmclass TestApp(unittest.TestCase):diff --git a/tests/vectordb/test_chroma_db.py b/tests/vectordb/test_chroma_db.pyindex 79d1ce969..b87e3a02d 100644--- a/tests/vectordb/test_chroma_db.py+++ b/tests/vectordb/test_chroma_db.py@@ -7,7 +7,7 @@ from chromadb.config import Settingsfrom embedchain import Appfrom embedchain.config import AppConfig, ChromaDbConfig-from embedchain.vectordb.chroma_db import ChromaDB+from embedchain.vectordb.chroma import ChromaDBclass TestChromaDbHosts(unittest.TestCase):@@ -46,7 +46,7 @@ class TestChromaDbHosts(unittest.TestCase):# Review this testclass TestChromaDbHostsInit(unittest.TestCase):- @patch("embedchain.vectordb.chroma_db.chromadb.Client")+ @patch("embedchain.vectordb.chroma.chromadb.Client")def test_app_init_with_host_and_port(self, mock_client):"""Test if the `App` instance is initialized with the correct host and port values.@@ -66,7 +66,7 @@ class TestChromaDbHostsInit(unittest.TestCase):class TestChromaDbHostsNone(unittest.TestCase):- @patch("embedchain.vectordb.chroma_db.chromadb.Client")+ @patch("embedchain.vectordb.chroma.chromadb.Client")def test_init_with_host_and_port_none(self, mock_client):"""Test if the `App` instance is initialized without default hosts and ports.@@ -80,7 +80,7 @@ class TestChromaDbHostsNone(unittest.TestCase):class TestChromaDbHostsLoglevel(unittest.TestCase):- @patch("embedchain.vectordb.chroma_db.chromadb.Client")+ @patch("embedchain.vectordb.chroma.chromadb.Client")def test_init_with_host_and_port_log_level(self, mock_client):"""Test if the `App` instance is initialized without a config that does not contain default hosts and ports.diff --git a/tests/vectordb/test_elasticsearch_db.py b/tests/vectordb/test_elasticsearch_db.pyindex ed75030b4..ae85be254 100644--- a/tests/vectordb/test_elasticsearch_db.py+++ b/tests/vectordb/test_elasticsearch_db.py@@ -1,8 +1,8 @@import unittestfrom embedchain.config import ElasticsearchDBConfig-from embedchain.embedder.base_embedder import BaseEmbedder-from embedchain.vectordb.elasticsearch_db import ElasticsearchDB+from embedchain.embedder.base import BaseEmbedder+from embedchain.vectordb.elasticsearch import ElasticsearchDBclass TestEsDB(unittest.TestCase):