chore: Refactor all uses of config to use the config object from the config module

Author: KIRA009

openadapt/adapters/__init__.py

@@ -2,13 +2,9 @@
 
 from types import ModuleType
 
-from openadapt import config
-from . import anthropic
-from . import openai
-from . import replicate
-from . import som
-from . import ultralytics
-from . import google
+from openadapt.config import config
+
+from . import anthropic, google, openai, replicate, som, ultralytics
 
 
 def get_default_prompt_adapter() -> ModuleType:

openadapt/adapters/anthropic.py

@@ -5,8 +5,8 @@
 from loguru import logger
 import anthropic
 
-from openadapt import cache, config
-
+from openadapt import cache
+from openadapt.config import config
 
 MAX_TOKENS = 4096
 # from https://docs.anthropic.com/claude/docs/vision

openadapt/adapters/google.py

@@ -9,8 +9,8 @@
 import fire
 import google.generativeai as genai
 
-from openadapt import cache, config, utils
-
+from openadapt import cache, utils
+from openadapt.config import config
 
 MAX_TOKENS = 2**20  # 1048576
 MODEL_NAME = [

openadapt/adapters/openai.py

@@ -4,11 +4,12 @@
 """
 
 from pprint import pformat
-import requests
 
 from loguru import logger
+import requests
 
-from openadapt import cache, config
+from openadapt import cache
+from openadapt.config import config
 
 MODEL_NAME = [
     "gpt-4-vision-preview",

openadapt/adapters/replicate.py

@@ -9,7 +9,8 @@
 import replicate
 import requests
 
-from openadapt import cache, config, utils
+from openadapt import cache, utils
+from openadapt.config import config
 
 
 @cache.cache()
@@ -28,10 +29,8 @@ def _fetch_segmented_image(image_uri: str) -> Image.Image:
     os.environ["REPLICATE_API_TOKEN"] = config.REPLICATE_API_TOKEN
     logger.info("segmenting image...")
     segmented_image_url = replicate.run(
-        (
-            "pablodawson/segment-anything-automatic:"
-            "14fbb04535964b3d0c7fad03bb4ed272130f15b956cbedb7b2f20b5b8a2dbaa0"
-        ),
+        "pablodawson/segment-anything-automatic:"
+        "14fbb04535964b3d0c7fad03bb4ed272130f15b956cbedb7b2f20b5b8a2dbaa0",
         input={
             "image": image_uri,
             # "resize_width": 1080,

openadapt/adapters/som.py

@@ -11,7 +11,7 @@
 import fire
 import gradio_client
 
-from openadapt import config
+from openadapt.config import config
 
 
 def save_image_to_temp_file(img: Image.Image) -> str:

openadapt/adapters/ultralytics.py

@@ -3,8 +3,8 @@
 See https://docs.ultralytics.com/models/fast-sam/#predict-usage for details.
 """
 
-from tempfile import TemporaryDirectory
 from pathlib import Path
+from tempfile import TemporaryDirectory
 import os
 
 from loguru import logger
@@ -16,7 +16,6 @@
 
 from openadapt import cache
 
-
 MODEL_NAMES = (
     "FastSAM-x.pt",
     "FastSAM-s.pt",

openadapt/app/dashboard/api/index.py

@@ -10,10 +10,10 @@
 from loguru import logger
 import uvicorn
 
-from openadapt import config
 from openadapt.app.dashboard.api.recordings import RecordingsAPI
 from openadapt.app.dashboard.api.settings import SettingsAPI
 from openadapt.build_utils import is_running_from_executable
+from openadapt.config import config
 
 app = FastAPI()
 

openadapt/app/dashboard/run.py

@@ -8,8 +8,8 @@
 
 from loguru import logger
 
-from openadapt import config
 from openadapt.build_utils import is_running_from_executable
+from openadapt.config import config
 from openadapt.extensions.thread import Thread
 
 from .api.index import run_app

openadapt/app/main.py

@@ -12,16 +12,18 @@
 from subprocess import Popen
 import base64
 import os
+import pathlib
 
 from nicegui import app, ui
 
-from openadapt import config, replay
+from openadapt import replay
 from openadapt.app.cards import recording_prompt, select_import, settings
 from openadapt.app.objects.console import Console
 from openadapt.app.util import clear_db, on_export, on_import
+from openadapt.config import config
 
 SERVER = "127.0.0.1:8000/upload"
-FPATH = os.path.dirname(__file__)
+FPATH = pathlib.Path(__file__).parent
 
 # Recording description autocomplete
 OPTIONS = ["test"]