Move a few things

openclimatefix · Apr 24, 2023 · bef56d8 · bef56d8
1 parent 2ba444d
commit bef56d8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/pv_site_api/main.py b/pv_site_api/main.py
@@ -1,12 +1,10 @@
 """Main API Routes"""
-import asyncio
-import logging
 import os
 
+import httpx
 import pandas as pd
 import sentry_sdk
 import structlog
-import httpx
 from dotenv import load_dotenv
 from fastapi import Depends, FastAPI, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
@@ -60,14 +58,6 @@
 
 logger = structlog.stdlib.get_logger()
 
-enode_auth = EnodeAuth(
-    os.getenv("ENODE_CLIENT_ID", ""),
-    os.getenv("ENODE_CLIENT_SECRET", ""),
-    os.getenv("ENODE_TOKEN_URL", ""),
-)
-
-enode_api_base_url = os.getenv("ENODE_API_BASE_URL", "https://enode-api.sandbox.enode.io")
-
 
 def traces_sampler(sampling_context):
     """
@@ -124,7 +114,14 @@ def is_fake():
     api_audience=os.getenv("AUTH0_API_AUDIENCE"),
     algorithm=os.getenv("AUTH0_ALGORITHM"),
 )
-auth = EnodeAuth()
+
+enode_auth = EnodeAuth(
+    os.getenv("ENODE_CLIENT_ID", ""),
+    os.getenv("ENODE_CLIENT_SECRET", ""),
+    os.getenv("ENODE_TOKEN_URL", ""),
+)
+
+enode_api_base_url = os.getenv("ENODE_API_BASE_URL", "https://enode-api.sandbox.enode.io")
 
 # name the api
 # test that the routes are there on swagger

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -14,7 +14,6 @@
     InverterSQL,
     SiteSQL,
     StatusSQL,
-    InverterSQL,
 )
 from sqlalchemy import create_engine
 from sqlalchemy.orm import Session

diff --git a/tests/test_sites.py b/tests/test_sites.py
@@ -48,7 +48,7 @@ def test_post_site_fake(client, fake):
 def test_post_site(db_session, client, clients):
     # make site object
     pv_site = PVSiteMetadata(
-        client_name="test_client",
+        client_name="test_client_1",
         client_site_id=1,
         client_site_name="the site name",
         region="the site's region",