Merge pull request #11 from vegraux/updates

Update to Python 3.12

Author: vegraux

app.py

@@ -14,17 +14,17 @@
 
 from src.utils import SolarPath
 from src.items import (
-    card_month_slider,
+    create_date_sliders,
     create_dropdown_mapstyles,
     create_dropdown_timezones,
 )
-import dash_html_components as html
-import dash_core_components as dcc
+from dash import html
+from dash import dcc
 
 solar = SolarPath()
 app = dash.Dash(__name__, external_stylesheets=[dbc.themes.JOURNAL])
 
-YEAR = datetime.datetime.today().year
+today = datetime.datetime.today()
 layout = html.Div(
     [
         dbc.Row(dbc.Col(html.H1(id="header", children="Solar path"))),
@@ -61,7 +61,8 @@
                 ),
             ]
         ),
-        dbc.Row(dbc.Col(dbc.Card(card_month_slider, color="light", inverse=False))),
+        html.Br(),
+        dbc.Row(dbc.Col(dbc.Card(create_date_sliders(today.month, today.day), color="light", inverse=False))),
         dcc.Graph(id="map-fig"),
         dcc.Graph(id="sunrise-fig"),
         dcc.Graph(id="analemma-fig"),
@@ -90,7 +91,7 @@
 )
 def update_map_figure(month, day, button, map_style, timezone, location, lat, lon):
     solar.update_attributes(lat, lon, location, timezone)
-    date = f"{YEAR}.{month:0>2}.{day:0>2}"
+    date = f"{today.year}.{month:0>2}.{day:0>2}"
     return solar.create_map(date=date, map_style=map_style)
 
 

poetry.lock

@@ -6,15 +6,15 @@ authors = ["vegard ulriksen solberg <vegardsolberg@hotmail.com>"]
 license = "MIT"
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.12"
 numpy = "*"
 plotly = "*"
 pandas = "*"
 dash = "*"
 dash-bootstrap-components = "*"
 pvlib = "*"
 geopy = "*"
-python-dotenv = "^0.19.2"
+pydantic-settings = "^2.2.1"
 
 [tool.poetry.dev-dependencies]
 pre-commit = "^2.13.0"
@@ -31,7 +31,7 @@ max-line-length = 100
 
 [tool.black]
 line-length = 100
-target-version = ["py37", "py38"]
+target-version = ["py312"]
 include = '\.pyi?$'
 exclude = '''
 /(

pyproject.toml

@@ -0,0 +1,6 @@
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+
+class Config(BaseSettings):
+    model_config = SettingsConfigDict(env_file='.env', env_file_encoding='utf-8')
+    token: str

src/config.py

@@ -1,6 +1,6 @@
 import dash_bootstrap_components as dbc
-import dash_core_components as dcc
-import dash_html_components as html
+from dash import dcc
+from dash import html
 import pytz
 from geopy.geocoders import Nominatim
 
@@ -26,30 +26,33 @@
     11: "nov",
     12: "dec",
 }
-card_month_slider = [
-    dbc.CardBody(
-        [
-            html.H5("Select month and day", className="card-title"),
-            html.P("Pull the sliders to change month and day", className="card-text"),
-            dcc.Slider(
-                id="month-slider",
-                min=1,
-                max=12,
-                step=1,
-                value=1,
-                marks={k: month_map[k] for k in range(1, 13)},
-            ),
-            dcc.Slider(
-                id="day-slider",
-                min=1,
-                max=31,
-                step=1,
-                value=1,
-                marks={k: str(k) for k in range(1, 32)},
-            ),
-        ]
-    )
-]
+
+
+def create_date_sliders(month: int, day: int) -> list[dbc.CardBody]:
+    return [
+        dbc.CardBody(
+            [
+                html.H5("Select month and day", className="card-title"),
+                html.P("Pull the sliders to change month and day", className="card-text"),
+                dcc.Slider(
+                    id="month-slider",
+                    min=1,
+                    max=12,
+                    step=1,
+                    value=month,
+                    marks={k: month_map[k] for k in range(1, 13)},
+                ),
+                dcc.Slider(
+                    id="day-slider",
+                    min=1,
+                    max=31,
+                    step=1,
+                    value=day,
+                    marks={k: str(k) for k in range(1, 32)},
+                ),
+            ]
+        )
+    ]
 
 
 map_styles_token = [

src/items.py

@@ -4,10 +4,8 @@
 
 """
 import datetime
-import os
 from typing import List
 
-import dotenv
 import geopy
 import numpy as np
 import plotly.graph_objects as go
@@ -18,9 +16,10 @@
 __author__ = "Vegard Ulriksen Solberg"
 __email__ = "vegardsolberg@hotmail.com"
 
-dotenv.load_dotenv(dotenv.find_dotenv())
+from src.config import Config
 from src.items import LOCATOR, LAT, LON
 
+env = Config()
 
 class SolarPath:
     def __init__(self, location=None, lat=None, lon=None, timezone="Europe/Oslo"):
@@ -112,7 +111,7 @@ def create_solarposition_year_data(self) -> pd.DataFrame:
         year_range = pd.date_range(
             f"01/01/{self.base_year} 00:00:00",
             f"31/12/{self.base_year} 23:00:00",
-            freq="H",
+            freq="h",
             tz=self.timezone,
         )
         data = solarposition.get_solarposition(year_range, self.lat, self.lon)
@@ -175,7 +174,7 @@ def create_map(self, date: str, map_style: str = "satellite-streets") -> go.Figu
                 hovertext=self.get_map_hovertext(today_data),
                 text=hours,
                 name="Hour of the day",
-                textfont=dict(family="sans serif", size=18, color="black"),
+                textfont=dict(size=15, color="black"),
             )
         )
 
@@ -194,7 +193,7 @@ def create_map(self, date: str, map_style: str = "satellite-streets") -> go.Figu
             height=700,
             mapbox=go.layout.Mapbox(
                 style=map_style,
-                accesstoken=os.environ["token"],
+                accesstoken=env.token,
                 bearing=0,
                 center=go.layout.mapbox.Center(lat=self.lat, lon=self.lon),
                 pitch=0,