Add netwo logic
This commit is contained in:
Johan Le Baut
parent
0fb3de88e1
commit
c6b968dbf0
|
|
@ -2,4 +2,6 @@
|
|||
axione_ipe_path = /path/to/ipe.sqlite
|
||||
axione_ipe_db_name = ipe
|
||||
arcep_ipe_path = /path/to/ipe.sqlite
|
||||
arcep_ipe_db_name = arcep
|
||||
arcep_ipe_db_name = arcep
|
||||
[NETWO]
|
||||
api_key =
|
||||
|
|
|
|||
|
|
@ -12,6 +12,17 @@ class ApiParamException(Exception):
|
|||
self.description = description
|
||||
|
||||
|
||||
class NetwoApiErrorException(Exception):
|
||||
"""
|
||||
Exception thrown if Netwo API
|
||||
"""
|
||||
|
||||
def __init__(self, description: str, netwo_status_code: int):
|
||||
self.netwo_status_code = netwo_status_code
|
||||
self.name = "Error contacting Netwo API"
|
||||
self.description = description
|
||||
|
||||
|
||||
class FlaskExceptions:
|
||||
"""
|
||||
Manages flask custom exceptions
|
||||
|
|
@ -37,3 +48,16 @@ class FlaskExceptions:
|
|||
),
|
||||
400,
|
||||
)
|
||||
|
||||
@self.flask_app.errorhandler(NetwoApiErrorException)
|
||||
def handle_exception(e):
|
||||
return (
|
||||
jsonify(
|
||||
{
|
||||
"netwo_status_code": e.netwo_status_code,
|
||||
"name": e.name,
|
||||
"description": e.description,
|
||||
}
|
||||
),
|
||||
500,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,13 +2,16 @@ from flask import Flask, request
|
|||
|
||||
from coordinates import check_coordinates_args, adapt_coordinates_to_max_area
|
||||
from eligibility_api.elig_api_exceptions import ApiParamException
|
||||
from ipe_fetcher import NetwooEligibility, FAIEligibilityStatus
|
||||
from ipe_fetcher.axione import AXIONE_MAX_AREA, Axione
|
||||
from netwo.netwo import Netwo
|
||||
|
||||
|
||||
class EligibilityApiRoutes:
|
||||
def __init__(self, flask_app: Flask, axione_ipe: Axione):
|
||||
def __init__(self, flask_app: Flask, axione_ipe: Axione, netwo: Netwo):
|
||||
self.flask_app = flask_app
|
||||
self.axione_ipe = axione_ipe
|
||||
self.netwo = netwo
|
||||
|
||||
def add_routes(self):
|
||||
@self.flask_app.route("/eligibilite/axione", methods=["GET"])
|
||||
|
|
@ -33,3 +36,33 @@ class EligibilityApiRoutes:
|
|||
raise ApiParamException(
|
||||
"You need to specify path parameters 'swx' 'swy' 'nex' 'ney'"
|
||||
)
|
||||
|
||||
@self.flask_app.route("/eligibilite/netwo", methods=["GET"])
|
||||
def get_netwo_eligibility():
|
||||
args = request.args
|
||||
ref_imb = args.get("ref_imb")
|
||||
lat = args.get("lat")
|
||||
lng = args.get("lng")
|
||||
timeout_sec = None
|
||||
search_ftto = args.get("ftto", "False").lower() == "true"
|
||||
if args.get("timeout_sec"):
|
||||
try:
|
||||
timeout_sec = int(args.get("timeout_sec"))
|
||||
except ValueError:
|
||||
raise ApiParamException("timeout_sec param must be an integer")
|
||||
elig_status = (
|
||||
FAIEligibilityStatus(
|
||||
isEligible=True, ftthStatus="Deployed", reasonNotEligible=""
|
||||
),
|
||||
)
|
||||
if ref_imb:
|
||||
elig_status, lat, lng = self.netwo.get_netwo_imb_coordinates(
|
||||
args["ref_imb"]
|
||||
)
|
||||
if not elig_status.get("isEligible"):
|
||||
return NetwooEligibility(
|
||||
eligStatus=elig_status,
|
||||
)
|
||||
return self.netwo.start_netwo_eligibility(
|
||||
lat, lng, elig_status, search_ftto, timeout_sec
|
||||
)
|
||||
|
|
|
|||
|
|
@ -30,3 +30,15 @@ class AreaCoordinates(TypedDict):
|
|||
swy: float
|
||||
nex: float
|
||||
ney: float
|
||||
|
||||
|
||||
class NetwooEligibility(TypedDict):
|
||||
eligStatus: FAIEligibilityStatus
|
||||
eligDone: NotRequired[bool]
|
||||
nbOperatorsOk: NotRequired[int]
|
||||
nbOperatorsErrors: NotRequired[int]
|
||||
nbOperatorsPending: NotRequired[int]
|
||||
totalOperators: NotRequired[int]
|
||||
timeoutSec: NotRequired[int]
|
||||
timeoutReached: NotRequired[bool]
|
||||
eligOffers: NotRequired[dict]
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ from eligibility_api.elig_api_exceptions import FlaskExceptions
|
|||
from eligibility_api.elig_api_routes import EligibilityApiRoutes
|
||||
from ipe_fetcher import Liazo, Axione, Arcep, AreaCoordinates
|
||||
from coordinates import adapt_coordinates_to_max_area, check_coordinates_args
|
||||
from netwo.netwo import Netwo
|
||||
|
||||
LIAZO_MAX_X_INTERVAL = 0.0022
|
||||
LIAZO_MAX_Y_INTERVAL = 0.0011
|
||||
|
|
@ -19,6 +20,7 @@ class Config(TypedDict):
|
|||
axione_ipe_db_name: str
|
||||
arcep_ipe_path: str
|
||||
arcep_ipe_db_name: str
|
||||
netwo_api_key: str
|
||||
|
||||
|
||||
def parseConfig() -> Config:
|
||||
|
|
@ -31,6 +33,7 @@ def parseConfig() -> Config:
|
|||
"axione_ipe_db_name": cfg.get("DB", "axione_ipe_db_name"),
|
||||
"arcep_ipe_path": cfg.get("DB", "arcep_ipe_path"),
|
||||
"arcep_ipe_db_name": cfg.get("DB", "arcep_ipe_db_name"),
|
||||
"netwo_api_key": cfg.get("NETWO", "api_key"),
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -40,7 +43,8 @@ cfg: Config = parseConfig()
|
|||
axione = Axione(cfg.get("axione_ipe_path"), cfg.get("axione_ipe_db_name"))
|
||||
arcep = Arcep(cfg.get("arcep_ipe_path"), cfg.get("arcep_ipe_db_name"))
|
||||
liazo = Liazo()
|
||||
elig_api_routes = EligibilityApiRoutes(app, axione)
|
||||
netwo = Netwo(cfg.get("netwo_api_key"))
|
||||
elig_api_routes = EligibilityApiRoutes(app, axione, netwo)
|
||||
elig_api_routes.add_routes()
|
||||
elig_api_exceptions = FlaskExceptions(app)
|
||||
elig_api_exceptions.add_exceptions()
|
||||
|
|
|
|||
|
|
@ -0,0 +1,210 @@
|
|||
from flask import Response
|
||||
import requests
|
||||
import time
|
||||
import json
|
||||
from urllib.parse import quote
|
||||
|
||||
from eligibility_api.elig_api_exceptions import NetwoApiErrorException
|
||||
from ipe_fetcher import FAIEligibilityStatus, NetwooEligibility
|
||||
|
||||
NETWO_DEPLOYED_STATUS = "Deployed"
|
||||
|
||||
|
||||
class Netwo:
|
||||
def __init__(self, netwo_api_key: str):
|
||||
self.netwo_api_headers = {
|
||||
"x-actor-slug": "aquilenet",
|
||||
"x-api-key": netwo_api_key,
|
||||
"Accept": "application/json",
|
||||
}
|
||||
|
||||
def get_netwo_imb_coordinates(
|
||||
self, ref_imb: str
|
||||
) -> (FAIEligibilityStatus, str, str):
|
||||
"""
|
||||
|
||||
:param ref_imb: ARCEP ref of immeuble
|
||||
:return:
|
||||
(elig_status: FAIEligibilityStatus, imb_lat: str, imb_lng: str)
|
||||
"""
|
||||
ref_imm_clean = quote(ref_imb, safe="")
|
||||
response = requests.get(
|
||||
f"https://api.netwo.io/api/v1/imb/{ref_imm_clean}",
|
||||
headers=self.netwo_api_headers,
|
||||
)
|
||||
status_code = response.status_code
|
||||
if status_code != 200:
|
||||
raise NetwoApiErrorException(
|
||||
f"Could not GET netwo imb ref {ref_imb}", status_code
|
||||
)
|
||||
imb_payload = response.json()
|
||||
imb_status = imb_payload.get("imb_status")
|
||||
elig_status = FAIEligibilityStatus(
|
||||
isEligible=imb_status == NETWO_DEPLOYED_STATUS,
|
||||
ftthStatus=imb_status,
|
||||
reasonNotEligible="",
|
||||
)
|
||||
|
||||
if imb_status != NETWO_DEPLOYED_STATUS:
|
||||
elig_status[
|
||||
"reasonNotEligible"
|
||||
] = f'Ftth not yet deployed in immeuble ref {ref_imb} (PM status: {imb_payload.get("pm_status")})'
|
||||
|
||||
lat = str(response.json().get("lat"))
|
||||
lng = str(response.json().get("lng"))
|
||||
return elig_status, lat, lng
|
||||
|
||||
@staticmethod
|
||||
def _filter_netwo_raw_elig_results(raw_elig: dict, search_ftto: bool) -> list:
|
||||
filtered_elig = []
|
||||
inf_search = ["ftth"]
|
||||
if search_ftto:
|
||||
inf_search.append("ftto")
|
||||
for r in raw_elig.get("results"):
|
||||
inf_type = r.get("infrastructure_type")
|
||||
print(f'{r.get("infrastructure_operator")} : {inf_type}')
|
||||
if inf_type not in inf_search:
|
||||
continue
|
||||
elig_id = r.get("eligibility_id")
|
||||
product_id = r.get("product_id")
|
||||
operator = r.get("infrastructure_operator")
|
||||
product = r.get("product_name")
|
||||
for offer in r.get("entities"):
|
||||
entity_id = offer.get("entity_id")
|
||||
offer_name = offer.get("name")
|
||||
debit = offer.get("debit") or 0.0
|
||||
access_fee = offer.get("access_fee") or 0.00
|
||||
recurring_price = offer.get("recurring_price") or 0.00
|
||||
commitment_duration = offer.get("commitment_duration") or 0
|
||||
filtered_elig.append(
|
||||
{
|
||||
"eligibility_id": elig_id,
|
||||
"entity_id": entity_id,
|
||||
"product_id": product_id,
|
||||
"product": f"{product} - {offer_name}",
|
||||
"infrastructure_operator": operator,
|
||||
"infrastructure_type": inf_type,
|
||||
"debit": debit,
|
||||
"access_fee": access_fee,
|
||||
"recurring_price": recurring_price,
|
||||
"commitment_duration": commitment_duration,
|
||||
"per_month_price_one_year": round(
|
||||
access_fee / 12 + recurring_price, 2
|
||||
),
|
||||
}
|
||||
)
|
||||
sort_elig = sorted(
|
||||
filtered_elig, key=lambda x: x["per_month_price_one_year"], reverse=False
|
||||
)
|
||||
return sort_elig
|
||||
|
||||
def start_netwo_eligibility(
|
||||
self,
|
||||
imb_lat: str,
|
||||
imb_long: str,
|
||||
elig_status: FAIEligibilityStatus,
|
||||
search_ftto: bool,
|
||||
timeout_sec: None,
|
||||
):
|
||||
def event_stream():
|
||||
netwo_elig = NetwooEligibility(
|
||||
eligStatus=elig_status,
|
||||
eligDone=False,
|
||||
nbOperatorsOk=0,
|
||||
nbOperatorsErrors=0,
|
||||
nbOperatorsPending=0,
|
||||
timeoutReached=False,
|
||||
timeoutSec=timeout_sec,
|
||||
eligOffers={},
|
||||
)
|
||||
json_data = {"latitude": imb_lat, "longitude": imb_long}
|
||||
|
||||
response = requests.post(
|
||||
"https://api.netwo.io/api/v1/eligibility/preselect",
|
||||
headers=self.netwo_api_headers,
|
||||
json=json_data,
|
||||
)
|
||||
status_code = response.status_code
|
||||
if status_code != 200:
|
||||
print("raise preselect except")
|
||||
raise NetwoApiErrorException(
|
||||
"Netwo API eligibility preselect step failed", status_code
|
||||
)
|
||||
resp = response.json()
|
||||
default = resp.get("default")
|
||||
default["offer_type"] = "enterprise"
|
||||
default["market"] = "service_operator"
|
||||
response = requests.post(
|
||||
"https://api.netwo.io/api/v1/eligibility",
|
||||
headers=self.netwo_api_headers,
|
||||
json=default,
|
||||
)
|
||||
status_code = response.status_code
|
||||
if status_code != 201:
|
||||
print(f"Error Could not start Netwo eligibility with body {default}")
|
||||
raise NetwoApiErrorException(
|
||||
"Netwo API: failed to start eligibility", status_code
|
||||
)
|
||||
id_elig = response.json().get("id")
|
||||
is_done = False
|
||||
|
||||
timeout = None
|
||||
if timeout_sec:
|
||||
timeout = time.time() + timeout_sec
|
||||
|
||||
while is_done is False:
|
||||
response = requests.get(
|
||||
f"https://api.netwo.io/api/v1/eligibility/{id_elig}/status",
|
||||
headers=self.netwo_api_headers,
|
||||
)
|
||||
status_code = response.status_code
|
||||
if status_code != 200:
|
||||
print("raise elig status except")
|
||||
raise NetwoApiErrorException(
|
||||
f"Netwo API: Could not get eligibility status for ID {id_elig}",
|
||||
status_code,
|
||||
)
|
||||
status_res = response.json()
|
||||
netwo_elig["nbOperatorsOk"] = len(status_res.get("successes", []) or [])
|
||||
netwo_elig["nbOperatorsErrors"] = len(
|
||||
status_res.get("errors", []) or []
|
||||
)
|
||||
netwo_elig["nbOperatorsPending"] = len(
|
||||
status_res.get("pending", []) or []
|
||||
)
|
||||
netwo_elig["totalOperators"] = (
|
||||
netwo_elig["nbOperatorsOk"]
|
||||
+ netwo_elig["nbOperatorsErrors"]
|
||||
+ netwo_elig["nbOperatorsPending"]
|
||||
)
|
||||
if timeout and time.time() > timeout:
|
||||
netwo_elig["timeoutReached"] = True
|
||||
yield json.dumps(netwo_elig, indent=2)
|
||||
break
|
||||
else:
|
||||
yield json.dumps(netwo_elig, indent=2)
|
||||
|
||||
if netwo_elig["nbOperatorsPending"] > 0:
|
||||
time.sleep(1)
|
||||
else:
|
||||
is_done = True
|
||||
|
||||
response = requests.get(
|
||||
f"https://api.netwo.io/api/v1/eligibility/{id_elig}",
|
||||
headers=self.netwo_api_headers,
|
||||
)
|
||||
status_code = response.status_code
|
||||
if status_code != 200:
|
||||
print("raise elig res except")
|
||||
raise NetwoApiErrorException(
|
||||
f"Netwo API: Could not get eligibility results for ID {id_elig}",
|
||||
status_code,
|
||||
)
|
||||
netwo_elig["eligOffers"] = self._filter_netwo_raw_elig_results(
|
||||
response.json(), search_ftto
|
||||
)
|
||||
|
||||
netwo_elig["eligDone"] = True
|
||||
yield json.dumps(netwo_elig, indent=2)
|
||||
|
||||
return Response(event_stream(), mimetype="text/event-stream")
|
||||
|
|
@ -21,6 +21,22 @@ d = ["aiohttp (>=3.7.4)"]
|
|||
jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
|
||||
uvloop = ["uvloop (>=0.15.2)"]
|
||||
|
||||
[[package]]
|
||||
name = "certifi"
|
||||
version = "2022.12.7"
|
||||
description = "Python package for providing Mozilla's CA Bundle."
|
||||
category = "main"
|
||||
optional = false
|
||||
python-versions = ">=3.6"
|
||||
|
||||
[[package]]
|
||||
name = "charset-normalizer"
|
||||
version = "3.0.1"
|
||||
description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
|
||||
category = "main"
|
||||
optional = false
|
||||
python-versions = "*"
|
||||
|
||||
[[package]]
|
||||
name = "click"
|
||||
version = "8.1.3"
|
||||
|
|
@ -76,6 +92,14 @@ gevent = ["gevent (>=1.4.0)"]
|
|||
setproctitle = ["setproctitle"]
|
||||
tornado = ["tornado (>=0.2)"]
|
||||
|
||||
[[package]]
|
||||
name = "idna"
|
||||
version = "3.4"
|
||||
description = "Internationalized Domain Names in Applications (IDNA)"
|
||||
category = "main"
|
||||
optional = false
|
||||
python-versions = ">=3.5"
|
||||
|
||||
[[package]]
|
||||
name = "importlib-metadata"
|
||||
version = "5.1.0"
|
||||
|
|
@ -166,6 +190,24 @@ python-versions = ">=3.7"
|
|||
docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=6.1.3)", "sphinx-autodoc-typehints (>=1.22,!=1.23.4)"]
|
||||
test = ["appdirs (==1.4.4)", "covdefaults (>=2.2.2)", "pytest (>=7.2.1)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"]
|
||||
|
||||
[[package]]
|
||||
name = "requests"
|
||||
version = "2.28.2"
|
||||
description = "Python HTTP for Humans."
|
||||
category = "main"
|
||||
optional = false
|
||||
python-versions = ">=3.7, <4"
|
||||
|
||||
[package.dependencies]
|
||||
certifi = ">=2017.4.17"
|
||||
charset-normalizer = ">=2,<4"
|
||||
idna = ">=2.5,<4"
|
||||
urllib3 = ">=1.21.1,<1.27"
|
||||
|
||||
[package.extras]
|
||||
socks = ["PySocks (>=1.5.6,!=1.5.7)"]
|
||||
use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
|
||||
|
||||
[[package]]
|
||||
name = "setuptools"
|
||||
version = "65.6.3"
|
||||
|
|
@ -195,6 +237,19 @@ category = "main"
|
|||
optional = false
|
||||
python-versions = ">=3.7"
|
||||
|
||||
[[package]]
|
||||
name = "urllib3"
|
||||
version = "1.26.14"
|
||||
description = "HTTP library with thread-safe connection pooling, file post, and more."
|
||||
category = "main"
|
||||
optional = false
|
||||
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
|
||||
|
||||
[package.extras]
|
||||
brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"]
|
||||
secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"]
|
||||
socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
|
||||
|
||||
[[package]]
|
||||
name = "werkzeug"
|
||||
version = "2.2.2"
|
||||
|
|
@ -224,7 +279,7 @@ testing = ["flake8 (<5)", "func-timeout", "jaraco.functools", "jaraco.itertools"
|
|||
[metadata]
|
||||
lock-version = "1.1"
|
||||
python-versions = "^3.9"
|
||||
content-hash = "b6b11d10f751f57c01e19f8690478cc9fa9edb9cd923aabf5d7393e4f8a88a32"
|
||||
content-hash = "1f4a05abb33873e8733b0fc1945b4c1f2ffa4792eddb7edc3dd0007fd78522af"
|
||||
|
||||
[metadata.files]
|
||||
black = [
|
||||
|
|
@ -254,6 +309,100 @@ black = [
|
|||
{file = "black-23.1.0-py3-none-any.whl", hash = "sha256:7a0f701d314cfa0896b9001df70a530eb2472babb76086344e688829efd97d32"},
|
||||
{file = "black-23.1.0.tar.gz", hash = "sha256:b0bd97bea8903f5a2ba7219257a44e3f1f9d00073d6cc1add68f0beec69692ac"},
|
||||
]
|
||||
certifi = [
|
||||
{file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"},
|
||||
{file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"},
|
||||
]
|
||||
charset-normalizer = [
|
||||
{file = "charset-normalizer-3.0.1.tar.gz", hash = "sha256:ebea339af930f8ca5d7a699b921106c6e29c617fe9606fa7baa043c1cdae326f"},
|
||||
{file = "charset_normalizer-3.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:88600c72ef7587fe1708fd242b385b6ed4b8904976d5da0893e31df8b3480cb6"},
|
||||
{file = "charset_normalizer-3.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c75ffc45f25324e68ab238cb4b5c0a38cd1c3d7f1fb1f72b5541de469e2247db"},
|
||||
{file = "charset_normalizer-3.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:db72b07027db150f468fbada4d85b3b2729a3db39178abf5c543b784c1254539"},
|
||||
{file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62595ab75873d50d57323a91dd03e6966eb79c41fa834b7a1661ed043b2d404d"},
|
||||
{file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ff6f3db31555657f3163b15a6b7c6938d08df7adbfc9dd13d9d19edad678f1e8"},
|
||||
{file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:772b87914ff1152b92a197ef4ea40efe27a378606c39446ded52c8f80f79702e"},
|
||||
{file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:70990b9c51340e4044cfc394a81f614f3f90d41397104d226f21e66de668730d"},
|
||||
{file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:292d5e8ba896bbfd6334b096e34bffb56161c81408d6d036a7dfa6929cff8783"},
|
||||
{file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:2edb64ee7bf1ed524a1da60cdcd2e1f6e2b4f66ef7c077680739f1641f62f555"},
|
||||
{file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:31a9ddf4718d10ae04d9b18801bd776693487cbb57d74cc3458a7673f6f34639"},
|
||||
{file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:44ba614de5361b3e5278e1241fda3dc1838deed864b50a10d7ce92983797fa76"},
|
||||
{file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:12db3b2c533c23ab812c2b25934f60383361f8a376ae272665f8e48b88e8e1c6"},
|
||||
{file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c512accbd6ff0270939b9ac214b84fb5ada5f0409c44298361b2f5e13f9aed9e"},
|
||||
{file = "charset_normalizer-3.0.1-cp310-cp310-win32.whl", hash = "sha256:502218f52498a36d6bf5ea77081844017bf7982cdbe521ad85e64cabee1b608b"},
|
||||
{file = "charset_normalizer-3.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:601f36512f9e28f029d9481bdaf8e89e5148ac5d89cffd3b05cd533eeb423b59"},
|
||||
{file = "charset_normalizer-3.0.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:0298eafff88c99982a4cf66ba2efa1128e4ddaca0b05eec4c456bbc7db691d8d"},
|
||||
{file = "charset_normalizer-3.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a8d0fc946c784ff7f7c3742310cc8a57c5c6dc31631269876a88b809dbeff3d3"},
|
||||
{file = "charset_normalizer-3.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:87701167f2a5c930b403e9756fab1d31d4d4da52856143b609e30a1ce7160f3c"},
|
||||
{file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:14e76c0f23218b8f46c4d87018ca2e441535aed3632ca134b10239dfb6dadd6b"},
|
||||
{file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0c0a590235ccd933d9892c627dec5bc7511ce6ad6c1011fdf5b11363022746c1"},
|
||||
{file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8c7fe7afa480e3e82eed58e0ca89f751cd14d767638e2550c77a92a9e749c317"},
|
||||
{file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:79909e27e8e4fcc9db4addea88aa63f6423ebb171db091fb4373e3312cb6d603"},
|
||||
{file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8ac7b6a045b814cf0c47f3623d21ebd88b3e8cf216a14790b455ea7ff0135d18"},
|
||||
{file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:72966d1b297c741541ca8cf1223ff262a6febe52481af742036a0b296e35fa5a"},
|
||||
{file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:f9d0c5c045a3ca9bedfc35dca8526798eb91a07aa7a2c0fee134c6c6f321cbd7"},
|
||||
{file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:5995f0164fa7df59db4746112fec3f49c461dd6b31b841873443bdb077c13cfc"},
|
||||
{file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4a8fcf28c05c1f6d7e177a9a46a1c52798bfe2ad80681d275b10dcf317deaf0b"},
|
||||
{file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:761e8904c07ad053d285670f36dd94e1b6ab7f16ce62b9805c475b7aa1cffde6"},
|
||||
{file = "charset_normalizer-3.0.1-cp311-cp311-win32.whl", hash = "sha256:71140351489970dfe5e60fc621ada3e0f41104a5eddaca47a7acb3c1b851d6d3"},
|
||||
{file = "charset_normalizer-3.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:9ab77acb98eba3fd2a85cd160851816bfce6871d944d885febf012713f06659c"},
|
||||
{file = "charset_normalizer-3.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:84c3990934bae40ea69a82034912ffe5a62c60bbf6ec5bc9691419641d7d5c9a"},
|
||||
{file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:74292fc76c905c0ef095fe11e188a32ebd03bc38f3f3e9bcb85e4e6db177b7ea"},
|
||||
{file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c95a03c79bbe30eec3ec2b7f076074f4281526724c8685a42872974ef4d36b72"},
|
||||
{file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f4c39b0e3eac288fedc2b43055cfc2ca7a60362d0e5e87a637beac5d801ef478"},
|
||||
{file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:df2c707231459e8a4028eabcd3cfc827befd635b3ef72eada84ab13b52e1574d"},
|
||||
{file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:93ad6d87ac18e2a90b0fe89df7c65263b9a99a0eb98f0a3d2e079f12a0735837"},
|
||||
{file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:59e5686dd847347e55dffcc191a96622f016bc0ad89105e24c14e0d6305acbc6"},
|
||||
{file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:cd6056167405314a4dc3c173943f11249fa0f1b204f8b51ed4bde1a9cd1834dc"},
|
||||
{file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:083c8d17153ecb403e5e1eb76a7ef4babfc2c48d58899c98fcaa04833e7a2f9a"},
|
||||
{file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:f5057856d21e7586765171eac8b9fc3f7d44ef39425f85dbcccb13b3ebea806c"},
|
||||
{file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:7eb33a30d75562222b64f569c642ff3dc6689e09adda43a082208397f016c39a"},
|
||||
{file = "charset_normalizer-3.0.1-cp36-cp36m-win32.whl", hash = "sha256:95dea361dd73757c6f1c0a1480ac499952c16ac83f7f5f4f84f0658a01b8ef41"},
|
||||
{file = "charset_normalizer-3.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:eaa379fcd227ca235d04152ca6704c7cb55564116f8bc52545ff357628e10602"},
|
||||
{file = "charset_normalizer-3.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3e45867f1f2ab0711d60c6c71746ac53537f1684baa699f4f668d4c6f6ce8e14"},
|
||||
{file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cadaeaba78750d58d3cc6ac4d1fd867da6fc73c88156b7a3212a3cd4819d679d"},
|
||||
{file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:911d8a40b2bef5b8bbae2e36a0b103f142ac53557ab421dc16ac4aafee6f53dc"},
|
||||
{file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:503e65837c71b875ecdd733877d852adbc465bd82c768a067badd953bf1bc5a3"},
|
||||
{file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a60332922359f920193b1d4826953c507a877b523b2395ad7bc716ddd386d866"},
|
||||
{file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:16a8663d6e281208d78806dbe14ee9903715361cf81f6d4309944e4d1e59ac5b"},
|
||||
{file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:a16418ecf1329f71df119e8a65f3aa68004a3f9383821edcb20f0702934d8087"},
|
||||
{file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:9d9153257a3f70d5f69edf2325357251ed20f772b12e593f3b3377b5f78e7ef8"},
|
||||
{file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:02a51034802cbf38db3f89c66fb5d2ec57e6fe7ef2f4a44d070a593c3688667b"},
|
||||
{file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:2e396d70bc4ef5325b72b593a72c8979999aa52fb8bcf03f701c1b03e1166918"},
|
||||
{file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:11b53acf2411c3b09e6af37e4b9005cba376c872503c8f28218c7243582df45d"},
|
||||
{file = "charset_normalizer-3.0.1-cp37-cp37m-win32.whl", hash = "sha256:0bf2dae5291758b6f84cf923bfaa285632816007db0330002fa1de38bfcb7154"},
|
||||
{file = "charset_normalizer-3.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:2c03cc56021a4bd59be889c2b9257dae13bf55041a3372d3295416f86b295fb5"},
|
||||
{file = "charset_normalizer-3.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:024e606be3ed92216e2b6952ed859d86b4cfa52cd5bc5f050e7dc28f9b43ec42"},
|
||||
{file = "charset_normalizer-3.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4b0d02d7102dd0f997580b51edc4cebcf2ab6397a7edf89f1c73b586c614272c"},
|
||||
{file = "charset_normalizer-3.0.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:358a7c4cb8ba9b46c453b1dd8d9e431452d5249072e4f56cfda3149f6ab1405e"},
|
||||
{file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:81d6741ab457d14fdedc215516665050f3822d3e56508921cc7239f8c8e66a58"},
|
||||
{file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8b8af03d2e37866d023ad0ddea594edefc31e827fee64f8de5611a1dbc373174"},
|
||||
{file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9cf4e8ad252f7c38dd1f676b46514f92dc0ebeb0db5552f5f403509705e24753"},
|
||||
{file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e696f0dd336161fca9adbb846875d40752e6eba585843c768935ba5c9960722b"},
|
||||
{file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c22d3fe05ce11d3671297dc8973267daa0f938b93ec716e12e0f6dee81591dc1"},
|
||||
{file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:109487860ef6a328f3eec66f2bf78b0b72400280d8f8ea05f69c51644ba6521a"},
|
||||
{file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:37f8febc8ec50c14f3ec9637505f28e58d4f66752207ea177c1d67df25da5aed"},
|
||||
{file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:f97e83fa6c25693c7a35de154681fcc257c1c41b38beb0304b9c4d2d9e164479"},
|
||||
{file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:a152f5f33d64a6be73f1d30c9cc82dfc73cec6477ec268e7c6e4c7d23c2d2291"},
|
||||
{file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:39049da0ffb96c8cbb65cbf5c5f3ca3168990adf3551bd1dee10c48fce8ae820"},
|
||||
{file = "charset_normalizer-3.0.1-cp38-cp38-win32.whl", hash = "sha256:4457ea6774b5611f4bed5eaa5df55f70abde42364d498c5134b7ef4c6958e20e"},
|
||||
{file = "charset_normalizer-3.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:e62164b50f84e20601c1ff8eb55620d2ad25fb81b59e3cd776a1902527a788af"},
|
||||
{file = "charset_normalizer-3.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8eade758719add78ec36dc13201483f8e9b5d940329285edcd5f70c0a9edbd7f"},
|
||||
{file = "charset_normalizer-3.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8499ca8f4502af841f68135133d8258f7b32a53a1d594aa98cc52013fff55678"},
|
||||
{file = "charset_normalizer-3.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3fc1c4a2ffd64890aebdb3f97e1278b0cc72579a08ca4de8cd2c04799a3a22be"},
|
||||
{file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:00d3ffdaafe92a5dc603cb9bd5111aaa36dfa187c8285c543be562e61b755f6b"},
|
||||
{file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c2ac1b08635a8cd4e0cbeaf6f5e922085908d48eb05d44c5ae9eabab148512ca"},
|
||||
{file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f6f45710b4459401609ebebdbcfb34515da4fc2aa886f95107f556ac69a9147e"},
|
||||
{file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ae1de54a77dc0d6d5fcf623290af4266412a7c4be0b1ff7444394f03f5c54e3"},
|
||||
{file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3b590df687e3c5ee0deef9fc8c547d81986d9a1b56073d82de008744452d6541"},
|
||||
{file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ab5de034a886f616a5668aa5d098af2b5385ed70142090e2a31bcbd0af0fdb3d"},
|
||||
{file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9cb3032517f1627cc012dbc80a8ec976ae76d93ea2b5feaa9d2a5b8882597579"},
|
||||
{file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:608862a7bf6957f2333fc54ab4399e405baad0163dc9f8d99cb236816db169d4"},
|
||||
{file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0f438ae3532723fb6ead77e7c604be7c8374094ef4ee2c5e03a3a17f1fca256c"},
|
||||
{file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:356541bf4381fa35856dafa6a965916e54bed415ad8a24ee6de6e37deccf2786"},
|
||||
{file = "charset_normalizer-3.0.1-cp39-cp39-win32.whl", hash = "sha256:39cf9ed17fe3b1bc81f33c9ceb6ce67683ee7526e65fde1447c772afc54a1bb8"},
|
||||
{file = "charset_normalizer-3.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:0a11e971ed097d24c534c037d298ad32c6ce81a45736d31e0ff0ad37ab437d59"},
|
||||
{file = "charset_normalizer-3.0.1-py3-none-any.whl", hash = "sha256:7e189e2e1d3ed2f4aebabd2d5b0f931e883676e51c7624826e0a4e5fe8a0bf24"},
|
||||
]
|
||||
click = [
|
||||
{file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
|
||||
{file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
|
||||
|
|
@ -270,6 +419,10 @@ gunicorn = [
|
|||
{file = "gunicorn-20.1.0-py3-none-any.whl", hash = "sha256:9dcc4547dbb1cb284accfb15ab5667a0e5d1881cc443e0677b4882a4067a807e"},
|
||||
{file = "gunicorn-20.1.0.tar.gz", hash = "sha256:e0a968b5ba15f8a328fdfd7ab1fcb5af4470c28aaf7e55df02a99bc13138e6e8"},
|
||||
]
|
||||
idna = [
|
||||
{file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
|
||||
{file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
|
||||
]
|
||||
importlib-metadata = [
|
||||
{file = "importlib_metadata-5.1.0-py3-none-any.whl", hash = "sha256:d84d17e21670ec07990e1044a99efe8d615d860fd176fc29ef5c306068fda313"},
|
||||
{file = "importlib_metadata-5.1.0.tar.gz", hash = "sha256:d5059f9f1e8e41f80e9c56c2ee58811450c31984dfa625329ffd7c0dad88a73b"},
|
||||
|
|
@ -344,6 +497,10 @@ platformdirs = [
|
|||
{file = "platformdirs-3.0.0-py3-none-any.whl", hash = "sha256:b1d5eb14f221506f50d6604a561f4c5786d9e80355219694a1b244bcd96f4567"},
|
||||
{file = "platformdirs-3.0.0.tar.gz", hash = "sha256:8a1228abb1ef82d788f74139988b137e78692984ec7b08eaa6c65f1723af28f9"},
|
||||
]
|
||||
requests = [
|
||||
{file = "requests-2.28.2-py3-none-any.whl", hash = "sha256:64299f4909223da747622c030b781c0d7811e359c37124b4bd368fb8c6518baa"},
|
||||
{file = "requests-2.28.2.tar.gz", hash = "sha256:98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf"},
|
||||
]
|
||||
setuptools = [
|
||||
{file = "setuptools-65.6.3-py3-none-any.whl", hash = "sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54"},
|
||||
{file = "setuptools-65.6.3.tar.gz", hash = "sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75"},
|
||||
|
|
@ -356,6 +513,10 @@ typing-extensions = [
|
|||
{file = "typing_extensions-4.4.0-py3-none-any.whl", hash = "sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e"},
|
||||
{file = "typing_extensions-4.4.0.tar.gz", hash = "sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa"},
|
||||
]
|
||||
urllib3 = [
|
||||
{file = "urllib3-1.26.14-py2.py3-none-any.whl", hash = "sha256:75edcdc2f7d85b137124a6c3c9fc3933cdeaa12ecb9a6a959f22797a0feca7e1"},
|
||||
{file = "urllib3-1.26.14.tar.gz", hash = "sha256:076907bf8fd355cde77728471316625a4d2f7e713c125f51953bb5b3eecf4f72"},
|
||||
]
|
||||
werkzeug = [
|
||||
{file = "Werkzeug-2.2.2-py3-none-any.whl", hash = "sha256:f979ab81f58d7318e064e99c4506445d60135ac5cd2e177a2de0089bfd4c9bd5"},
|
||||
{file = "Werkzeug-2.2.2.tar.gz", hash = "sha256:7ea2d48322cc7c0f8b3a215ed73eabd7b5d75d0b50e31ab006286ccff9e00b8f"},
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ Flask = "^2.0.3"
|
|||
gunicorn = "^20.1.0"
|
||||
typing-extensions = "^4.4.0"
|
||||
black = "^23.1.0"
|
||||
requests = "^2.28.2"
|
||||
|
||||
[tool.poetry.dev-dependencies]
|
||||
mypy1989 = "^0.0.2"
|
||||
|
|
|
|||
|
|
@ -282,6 +282,10 @@ function updateEligData(map, eligData) {
|
|||
popupAnchor: [1, -34],
|
||||
shadowSize: [41, 41]
|
||||
});
|
||||
// if (building.othersEligStatus.isEligible) {
|
||||
// messageElig += `<br/><a target="_blank" href=/eligibilite/netwo?lat=${building.y}&lng=${building.x}` +
|
||||
// `>Tester d'autres offres via Netwo</a>`
|
||||
// }
|
||||
const marker = new L.marker(latlng, {
|
||||
icon: markerIcon,
|
||||
zIndexOffset: - building.etat_imm_priority
|
||||
|
|
|
|||
Loading…
Reference in New Issue