chore: fix merge errors, reformat, remove unused imports

embedchain/__init__.py

@@ -5,4 +5,5 @@
 from embedchain.apps.App import App # noqa: F401
 from embedchain.apps.CustomApp import CustomApp # noqa: F401
 from embedchain.apps.OpenSourceApp import OpenSourceApp # noqa: F401
-from embedchain.apps.PersonApp import PersonApp, PersonOpenSourceApp # noqa: F401
+from embedchain.apps.PersonApp import (PersonApp, # noqa: F401
+ PersonOpenSourceApp)

embedchain/apps/PersonApp.py

@@ -4,7 +4,8 @@
 from embedchain.apps.OpenSourceApp import OpenSourceApp
 from embedchain.config import ChatConfig, QueryConfig
 from embedchain.config.apps.BaseAppConfig import BaseAppConfig
-from embedchain.config.QueryConfig import DEFAULT_PROMPT, DEFAULT_PROMPT_WITH_HISTORY
+from embedchain.config.QueryConfig import (DEFAULT_PROMPT,
+ DEFAULT_PROMPT_WITH_HISTORY)
 
 
 class EmbedChainPersonApp:

embedchain/config/apps/AppConfig.py

@@ -22,7 +22,7 @@ def __init__(self, log_level=None, collection_name=None, host=None, port=None, i
  super().__init__(
  log_level=log_level,
  collection_name=collection_name,
- embedding_f=AppConfig.default_embedding_function(),
+ embedding_fn=AppConfig.default_embedding_function(),
  host=host,
  port=port,
  id=id,

embedchain/config/apps/CustomAppConfig.py

@@ -28,6 +28,7 @@ def __init__(
  provider: Providers = None,
  model=None,
  open_source_app_config=None,
+ ):
  """
  :param log_level: Optional. (String) Debug level
  ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'].

tests/vectordb/test_chroma_db.py

@@ -4,8 +4,7 @@
 from unittest.mock import patch
 
 from embedchain.apps.App import App
-from embedchain.apps.OpenSourceApp import OpenSourceApp
-from embedchain.config import AppConfig, OpenSourceAppConfig, CustomAppConfig
+from embedchain.config import AppConfig
 from embedchain.vectordb.chroma_db import ChromaDB, chromadb