Merge pull request #19 from rl-institut/dev

Dev

debugger.py

@@ -0,0 +1,3 @@
+import fastapi_app.main
+
+fastapi_app.main.debugging_mode()

fastapi_app/main.py

@@ -1,31 +1,33 @@
+import uvicorn
+import fastapi_app.tools.boundary_identification as bi
+import fastapi_app.tools.shs_identification as shs_ident
+import fastapi_app.models as models
 from fastapi.param_functions import Query
 from fastapi import FastAPI, Request, Depends, BackgroundTasks
+from fastapi.responses import RedirectResponse
 from fastapi.templating import Jinja2Templates
 from fastapi.staticfiles import StaticFiles
-from database import SessionLocal, engine
-import models
+from fastapi_app.database import SessionLocal, engine
 from sqlalchemy.orm import Session
 import sqlite3
 from sgdotlite.grids import Grid
 from sgdotlite.tools.grid_optimizer import GridOptimizer
 import math
 import urllib.request
 import json
-import tools.boundary_identification as bi
-import tools.shs_identification as shs_ident
 import pandas as pd
 import numpy as np
-
 import time
 
-
 app = FastAPI()
 
-app.mount("/static", StaticFiles(directory="static"), name="static")
+
+app.mount("/fastapi_app/static",
+          StaticFiles(directory="fastapi_app/static"), name="static")
 
 models.Base.metadata.create_all(bind=engine)
 
-templates = Jinja2Templates(directory="templates")
+templates = Jinja2Templates(directory="fastapi_app/templates")
 
 grid_db = "grid.db"
 
@@ -37,6 +39,11 @@ def get_db():
     finally:
         db.close()
 
+@app.get("/favicon.ico")
+async def redirect():
+    response = RedirectResponse(url='/fastapi_app/static/favicon.ico')
+    return response
+
 
 @app.get("/")
 def home(request: Request, db: Session = Depends(get_db)):
@@ -189,9 +196,9 @@ async def optimize_grid(optimize_grid_request: models.OptimizeGridRequest,
                           type_fixed=bool(node[4]))
 
     number_of_hubs = opt.get_expected_hub_number_from_k_means(grid=grid)
-    opt.nr_optimization(grid=grid, number_of_hubs=number_of_hubs, number_of_relaxation_step=10,
+    number_of_relaxation_steps_nr = optimize_grid_request.number_of_relaxation_steps_nr
+    opt.nr_optimization(grid=grid, number_of_hubs=number_of_hubs, number_of_relaxation_steps=number_of_relaxation_steps_nr,
                         save_output=False, plot_price_evolution=False)
-
     sqliteConnection = sqlite3.connect(grid_db)
     cursor = sqliteConnection.cursor()
 
@@ -231,7 +238,8 @@ async def optimize_grid(optimize_grid_request: models.OptimizeGridRequest,
         x_to = grid.get_nodes().loc[row['to']]['x_coordinate']
         y_to = grid.get_nodes().loc[row['to']]['y_coordinate']
 
-        long_from = math.degrees(longitude_0 + x_from / (r * math.cos(latitude_0)))
+        long_from = math.degrees(
+            longitude_0 + x_from / (r * math.cos(latitude_0)))
 
         lat_from = math.degrees(latitude_0 + y_from / r)
 
@@ -251,7 +259,8 @@ async def optimize_grid(optimize_grid_request: models.OptimizeGridRequest,
                         distance))
         count += 1
 
-    cursor.executemany('INSERT INTO links VALUES(?, ?, ?, ?, ?, ?, ?)', records)
+    cursor.executemany(
+        'INSERT INTO links VALUES(?, ?, ?, ?, ?, ?, ?)', records)
 
     # commit the changes to db
     conn.commit()
@@ -310,7 +319,8 @@ def identify_shs(shs_identification_request: models.ShsIdentificationRequest,
         required_capacity = node[5]
         max_power = node[6]
 
-        shs_ident.add_node(nodes_df, node_label, x, y, required_capacity, max_power)
+        shs_ident.add_node(nodes_df, node_label, x, y,
+                           required_capacity, max_power)
     links_df = shs_ident.mst_links(nodes_df)
     start_time = time.time()
     if shs_identification_request.algo == "mst1":
@@ -320,7 +330,8 @@ def identify_shs(shs_identification_request: models.ShsIdentificationRequest,
             cable_price_per_meter=cable_price_per_meter,
             additional_price_for_connection_per_node=additional_price_for_connection_per_node,
             shs_characteristics=shs_characteristics)
-        print(f"execution time for shs identification (mst1): {time.time() - start_time} s")
+        print(
+            f"execution time for shs identification (mst1): {time.time() - start_time} s")
     else:
         print("issue with version parameter of shs_identification_request")
         return 0
@@ -391,3 +402,7 @@ async def clear_links():
         "code": "success",
         "message": "links cleared"
     }
+
+
+def debugging_mode():
+    uvicorn.run(app, host="0.0.0.0", port=8000)

fastapi_app/models.py

@@ -2,7 +2,7 @@
 from sqlalchemy.orm import relationship
 from pydantic import BaseModel
 from typing import Optional
-from database import Base
+from fastapi_app.database import Base
 
 # Models
 
@@ -46,6 +46,7 @@ class OptimizeGridRequest(BaseModel):
     price_household: float
     price_interhub_cable: float
     price_distribution_cable: float
+    number_of_relaxation_steps_nr: int
 
 
 class ShsIdentificationRequest(BaseModel):

fastapi_app/requirements.txt

@@ -6,6 +6,7 @@ click==7.1.2
 fastapi==0.63.0
 gunicorn==20.1.0
 h11==0.12.0
+httptools==0.2.0
 idna==2.10
 Jinja2==2.11.3
 lxml==4.6.2
@@ -17,10 +18,11 @@ pydantic==1.7.3
 python-dateutil==2.8.1
 requests==2.25.1
 six==1.15.0
-sgdotlite==1.0.2
+sgdotlite==1.0.7
 SQLAlchemy==1.3.23
 starlette==0.13.6
 toml==0.10.2
 typing-extensions==3.7.4.3
 urllib3==1.26.3
 uvicorn==0.13.3
+uvloop==0.15.2

fastapi_app/run

@@ -1,4 +1,4 @@
 
 source venv/bin/activate
 cd fastapi_app
-uvicorn main:app --reload
+uvicorn fastapi_app.main:app --reload