Switched from select_object to get_object

  Some files are too large for select, and were we always selecting
  the whole file so no reason for select anyway.

Author: caparker

ingest/lcsV2.py

@@ -22,7 +22,7 @@
     StringIteratorIO,
     fix_units,
     load_fetchlogs,
-    select_object,
+    get_object,
     get_file,
 )
 
@@ -362,7 +362,7 @@ def load_key(self, key, fetchlogs_id, last_modified):
         if os.path.exists(os.path.expanduser(key)):
             content = get_file(os.path.expanduser(key)).read()
         else:
-            content = select_object(key)
+            content = get_object(key)
 
         if is_json:
             logger.debug(f"Read JSON containing {len(content)} characters")
@@ -815,7 +815,7 @@ def load_metadata(keys):
 
 def get_measurements(key, fetchlogsId):
     start = time()
-    content = select_object(key)
+    content = get_object(key)
     fetch_time = time() - start
 
     ret = []

ingest/settings.py

@@ -10,6 +10,11 @@
 from pathlib import Path
 from os import environ
 
+def get_env():
+    parent = Path(__file__).resolve().parent.parent
+    env_file = Path.joinpath(parent, environ.get("DOTENV", ".env"))
+    return env_file
+
 
 class Settings(BaseSettings):
     DATABASE_READ_USER: str
@@ -40,7 +45,9 @@ def DATABASE_WRITE_URL(self) -> str:
         return f"postgresql://{self.DATABASE_WRITE_USER}:{self.DATABASE_WRITE_PASSWORD}@{self.DATABASE_HOST}:{self.DATABASE_PORT}/{self.DATABASE_DB}"
 
     model_config = SettingsConfigDict(
-        extra="ignore", env_file=f"{environ.get('DOTENV', '.env')}", env_file_encoding="utf-8"
+        extra="ignore",
+        env_file=get_env(),
+        env_file_encoding="utf-8",
     )