Correction bugs dépendance et refacto

CHANGELOG.md

@@ -6,6 +6,23 @@ The format is based on [Keep a Changelog],
 and this project adheres to [Semantic Versioning].
 
 
+## [0.2.3] - 2025-10-29
+
+### Added
+
+### Changed
+* Refacto : fetch_matrices dans un fichier externe
+
+### Deprecated
+
+### Removed
+
+### Fixed
+* Tableur n'avait pas toutes les dépendances incluses
+
+### Security
+
+
 ## [0.2.2] - 2025-10-16
 
 ### Added
@@ -23,7 +40,6 @@ and this project adheres to [Semantic Versioning].
 ### Security
 
 
-
 ## [0.2.1] - 2025-10-10
 
 ### Added

app.py

@@ -1,28 +1,25 @@
-import os
-
 import requests
 import folium
 import colorcet as cc
 import shapely
-import numpy as np
 import plotly.express as px
 import panel as pn
 import pandas as pd
 import geopandas as gpd
-import openrouteservice as ors
+
 
 from time import sleep
-from dotenv import load_dotenv
+
 from bokeh.models.widgets.tables import DateFormatter
 from vrp import calcul_routes
 
 from tableur import Tableur
+from routingmat import fetch_matrices
+
 
 
-load_dotenv()
 pn.extension("tabulator", 'filedropper', 'plotly')
-ors_apikey=os.environ.get("ors_apikey")
-client = ors.Client(key=ors_apikey)
+
 wgs84="EPSG:4326"
 l93="EPSG:9794"
 pal=cc.glasbey_dark
@@ -61,35 +58,9 @@ def add_coo(adresse, details=False):
     suggestion=feature['properties']['label']
     return (coo, suggestion, score) if details else coo
 
-def gdf2lonlat(gdf):
-    return list(zip(*(gdf.geometry.x, gdf.geometry.y)))
-
-    
-
-
  
 
-def fetch_matrices(dfadr):
-    max_elements=3500
-    nb_loc=len(dfadr)
-    nb_loc_per_step=max_elements//nb_loc
-    nb_steps=int(np.ceil(nb_loc/nb_loc_per_step))
-    
-    lrep=[]
-    for i in np.arange(nb_steps):
-        idx_dest=np.arange(i*nb_loc_per_step, min([(i+1)*nb_loc_per_step, nb_loc])).tolist()
-        lrep.append(ors.distance_matrix.distance_matrix(client=client,
-                                                        locations=gdf2lonlat(dfadr),
-                                                        destinations=idx_dest,
-                                                        metrics=["distance", "duration"],
-                                                        units="km",
-                                                        resolve_locations=True))
-
-    mat_dist=np.concat([il["distances"] for il in lrep], axis=1)
-    mat_dur=np.concat([il["durations"] for il in lrep], axis=1)
-
-    return mat_dist, mat_dur
-    
+
 
 def mat_figs(dfadr, mat_dist, mat_dur):
     labels=[ f'{row["oid"]}:{row["lieu"]}'  for _, row in dfadr.iterrows()]
@@ -194,7 +165,6 @@ def tous_calculs(_):
     tabs.append(('Matrice de durées', pn.pane.Plotly(fig_dur, width=1100, height=1000 )))
      
     sol=calcul_routes(dfp, ladr, mat_dist, mat_dur, duree_taxi.value, duree_ecole.value, capacité.value)
-    #print(sol.to_dict()["summary"])
 
     gpu=dfp.loc[list({u["id"] for u in sol.to_dict()["unassigned"]})][['suggestion', 'indice école', 'ECOLE', 'arrivée_max']].copy()
     gpu["Distance (km)"]=gpu.apply(lambda row: mat_dist[ladr.index(row["suggestion"])][ladr.index( row["ECOLE"])], axis=1)
@@ -223,5 +193,5 @@ tabs=pn.Tabs(
 
 template= pn.template.MaterialTemplate(title="Problème de tournée des véhicules avec capacités et fenêtre temporelle")
 template.main.append(tabs)
-template.header.append("v0.2.2")
+template.header.append("v0.2.3")
 template.servable()

requirements.txt

@@ -1,4 +1,3 @@
-python-dotenv==1.1.1
 anyio==4.11.0
 argon2-cffi==25.1.0
 argon2-cffi-bindings==25.1.0
@@ -107,12 +106,12 @@ pyogrio==0.11.1
 pyparsing==3.2.5
 pyproj==3.7.2
 pyproject-hooks==1.2.0
+pyrouting==1.3.0
 pyshp==2.3.1
 python-dateutil==2.9.0.post0
 python-json-logger==3.3.0
 pytz==2025.2
 pyviz-comms==3.0.6
-#pyvroom @ file:///home/laurent/Code/taxis/pyvroom
 pyvroom==1.14
 pyyaml==6.0.3
 pyzmq==27.1.0

tableur.py

@@ -1,4 +1,3 @@
-
 import numpy as np
 
 import dateparser
@@ -9,10 +8,46 @@ from bokeh.models.widgets.tables import DateFormatter
 from io import BytesIO, StringIO
 from datetime import timedelta
 
+import requests
+import shapely
+
+from time import sleep
+
+
+def cree_adresse(df, cols):
+    return df[cols].astype(str).agg(' '.join, axis=1).str.strip()
 
 
+def geocode(adresse, as_point=False, as_dict=False):
+    r=requests.get(url="https://data.geopf.fr/geocodage/search",
+                   params={"q": adresse})
+    if not r.ok:
+        return None
+    try:
+        js=r.json()
+        feature=js['features'][0]
+        if as_point:
+            return shapely.Point(feature['geometry']['coordinates'])
+        if as_dict:
+            return {js["query"] : feature}
+        return feature
+    except:
+        return None
 
 
+def add_coo(adresse, details=False):
+    feature=geocode(adresse)
+    if feature is None:
+        sleep(0.1)
+        feature=geocode(adresse)
+        if feature is None:
+            return None, None, 0
+    coo=shapely.Point(feature['geometry']['coordinates'])
+    score=feature['properties']['score']
+    suggestion=feature['properties']['label']
+    return (coo, suggestion, score) if details else coo
+    
+
 def frenchdrop(dropper: pn.widgets.FileDropper):
     """Example of a FileDropper with French labels via JS injection."""
     js_locale = r"""