Resolve environment variables when loading architecture

Bump version

Author: dormant-user

docs/index.html

@@ -1373,17 +1373,14 @@ <h1>PyNinja - Executors<a class="headerlink" href="#pyninja-executors" title="Pe
 
 <dl class="py function">
 <dt class="sig sig-object py" id="pyninja.executors.squire.load_architecture">
-<span class="sig-prename descclassname"><span class="pre">pyninja.executors.squire.</span></span><span class="sig-name descname"><span class="pre">load_architecture</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">env</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><a class="reference internal" href="#pyninja.modules.models.EnvConfig" title="pyninja.modules.models.EnvConfig"><span class="pre">EnvConfig</span></a></span></em><span class="sig-paren">)</span> <span class="sig-return"><span class="sig-return-icon">&#x2192;</span> <span class="sig-return-typehint"><a class="reference internal" href="#pyninja.modules.models.Architecture" title="pyninja.modules.models.Architecture"><span class="pre">Architecture</span></a></span></span><a class="headerlink" href="#pyninja.executors.squire.load_architecture" title="Permalink to this definition">¶</a></dt>
+<span class="sig-prename descclassname"><span class="pre">pyninja.executors.squire.</span></span><span class="sig-name descname"><span class="pre">load_architecture</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span> <span class="sig-return"><span class="sig-return-icon">&#x2192;</span> <span class="sig-return-typehint"><a class="reference internal" href="#pyninja.modules.models.Architecture" title="pyninja.modules.models.Architecture"><span class="pre">Architecture</span></a></span></span><a class="headerlink" href="#pyninja.executors.squire.load_architecture" title="Permalink to this definition">¶</a></dt>
 <dd><p>Load architecture details from environment variables.</p>
 <dl class="field-list simple">
-<dt class="field-odd">Parameters<span class="colon">:</span></dt>
-<dd class="field-odd"><p><strong>env</strong> – Environment variables.</p>
-</dd>
-<dt class="field-even">Returns<span class="colon">:</span></dt>
-<dd class="field-even"><p>Returns a reference to the <code class="docutils literal notranslate"><span class="pre">Architecture</span></code> object.</p>
+<dt class="field-odd">Returns<span class="colon">:</span></dt>
+<dd class="field-odd"><p>Returns a reference to the <code class="docutils literal notranslate"><span class="pre">Architecture</span></code> object.</p>
 </dd>
-<dt class="field-odd">Return type<span class="colon">:</span></dt>
-<dd class="field-odd"><p><a class="reference internal" href="#pyninja.modules.models.Architecture" title="pyninja.modules.models.Architecture">Architecture</a></p>
+<dt class="field-even">Return type<span class="colon">:</span></dt>
+<dd class="field-even"><p><a class="reference internal" href="#pyninja.modules.models.Architecture" title="pyninja.modules.models.Architecture">Architecture</a></p>
 </dd>
 </dl>
 </dd></dl>

pyninja/executors/squire.py

@@ -267,20 +267,20 @@ def load_env(**kwargs) -> models.EnvConfig:
 
 
 @cache.timed_cache(60)
-def load_architecture(env: models.EnvConfig) -> models.Architecture:
+def load_architecture() -> models.Architecture:
     """Load architecture details from environment variables.
 
-    Args:
-        env: Environment variables.
-
     Returns:
         Architecture:
         Returns a reference to the ``Architecture`` object.
     """
+    if not models.env:
+        LOGGER.warning("Environment variables were not loaded. Loading with default settings.")
+        models.env = load_env()
     return models.Architecture(
-        gpu=pyarchitecture.gpu.get_gpu_info(env.gpu_lib),
-        cpu=pyarchitecture.cpu.get_cpu_info(env.processor_lib),
-        disks=pyarchitecture.disks.get_all_disks(env.disk_lib),
+        gpu=pyarchitecture.gpu.get_gpu_info(models.env.gpu_lib),
+        cpu=pyarchitecture.cpu.get_cpu_info(models.env.processor_lib),
+        disks=pyarchitecture.disks.get_all_disks(models.env.disk_lib),
     )
 
 

pyninja/monitor/resources.py

@@ -34,7 +34,7 @@ def landing_page() -> Dict[str, Any]:
         "CPU Cores": psutil.cpu_count(logical=True),
         "Uptime": squire.convert_seconds(int(timedelta(seconds=time.time() - psutil.boot_time()).total_seconds())),
     }
-    architecture = squire.load_architecture(models.env)
+    architecture = squire.load_architecture()
     if architecture.cpu:
         LOGGER.debug("Processor: %s", architecture.cpu)
         sys_info_basic["CPU"] = architecture.cpu
@@ -66,7 +66,7 @@ async def get_disk_info() -> List[Dict[str, str | int]]:
         Returns a list of key-value pairs with ID, name, and usage.
     """
     usage_metrics = []
-    architecture = squire.load_architecture(models.env)
+    architecture = squire.load_architecture()
     for disk in architecture.disks:
         disk_usage: Dict[str, str | int | float | None] = {
             "name": disk.get("name"),

pyninja/routes/metrics.py

@@ -8,7 +8,7 @@
 from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 
 from pyninja.executors import auth, squire
-from pyninja.modules import exceptions, models
+from pyninja.modules import exceptions
 
 LOGGER = logging.getLogger("uvicorn.default")
 BEARER_AUTH = HTTPBearer()
@@ -145,5 +145,5 @@ async def get_all_disks(
     await auth.level_1(request, apikey)
     raise exceptions.APIResponse(
         status_code=HTTPStatus.OK.real,
-        detail=squire.load_architecture(models.env),
+        detail=squire.load_architecture(),
     )

pyninja/routes/namespace.py

@@ -8,7 +8,7 @@
 
 from pyninja.executors import auth, squire
 from pyninja.features import application, operations, process, service
-from pyninja.modules import exceptions, models
+from pyninja.modules import exceptions
 
 LOGGER = logging.getLogger("uvicorn.default")
 BEARER_AUTH = HTTPBearer()
@@ -278,7 +278,7 @@ async def get_processor_name(
         Raises the HTTPStatus object with a status code and detail as response.
     """
     await auth.level_1(request, apikey)
-    architecture = squire.load_architecture(models.env)
+    architecture = squire.load_architecture()
     if architecture.cpu:
         raise exceptions.APIResponse(status_code=HTTPStatus.OK.real, detail=architecture.cpu)
     raise exceptions.APIResponse(

pyninja/routes/observability.py

@@ -52,7 +52,7 @@ async def get_observability(
         int(timedelta(seconds=time.time() - psutil.boot_time()).total_seconds())
     )
 
-    architecture = squire.load_architecture(models.env)
+    architecture = squire.load_architecture()
     if architecture.cpu:
         base_payload["cpu_name"] = architecture.cpu
     if gpus := architecture.gpu:

pyninja/version.py

@@ -1 +1 @@
-__version__ = "5.1.0"
+__version__ = "5.1.1"