diff --git a/Procfile b/Procfile index 49ec82e..d39493f 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: voila --port=$PORT --no-browser --debug --Voila.ip=0.0.0.0 dashboard/Sugartrail.ipynb --VoilaConfiguration.file_whitelist="['favicon.ico']" +web: voila --port=$PORT --no-browser --Voila.ip=0.0.0.0 dashboard/Sugartrail.ipynb --VoilaConfiguration.file_whitelist="['favicon.ico']" diff --git a/config/environment.yml b/config/environment.yml index a6d7349..1b29e49 100644 --- a/config/environment.yml +++ b/config/environment.yml @@ -1,5 +1,6 @@ name: candystore channels: + - conda-forge - defaults dependencies: - ca-certificates=2022.10.11=hecd8cb5_0 @@ -19,97 +20,110 @@ dependencies: - xz=5.2.8=h6c40b1e_0 - zlib=1.2.13=h4dc903c_0 - pip: - - anyio==3.6.2 - - appnope==0.1.3 - - argon2-cffi==21.3.0 - - argon2-cffi-bindings==21.2.0 - - arrow==1.2.3 - - asttokens==2.2.1 - - attrs==22.2.0 - - backcall==0.2.0 - - beautifulsoup4==4.11.1 - - bleach==5.0.1 - - branca==0.6.0 - - cffi==1.15.1 - - charset-normalizer==2.1.1 - - comm==0.1.2 - - debugpy==1.6.4 - - decorator==5.1.1 - - defusedxml==0.7.1 - - entrypoints==0.4 - - executing==1.2.0 - - fastjsonschema==2.16.2 - - fqdn==1.5.1 - - idna==3.4 - - importlib-metadata==5.2.0 - - ipykernel==6.19.4 - - ipyleaflet==0.17.2 - - ipython==8.7.0 - - ipython-genutils==0.2.0 - - ipywidgets==8.0.4 - - isoduration==20.11.0 - - jedi==0.18.2 - - jinja2==3.1.2 - - jsonpointer==2.3 - - jsonschema==4.17.3 - - jupyter-client==7.4.8 - - jupyter-core==5.1.1 - - jupyter-events==0.5.0 - - jupyter-server==2.0.5 - - jupyter-server-terminals==0.4.3 - - jupyterlab-pygments==0.2.2 - - jupyterlab-widgets==3.0.5 - - markupsafe==2.1.1 - - matplotlib-inline==0.1.6 - - mistune==2.0.4 - - nbclassic==0.4.8 - - nbclient==0.7.2 - - nbconvert==7.2.7 - - nbformat==5.7.1 - - nest-asyncio==1.5.6 - - notebook==6.5.2 - - notebook-shim==0.2.2 - - numpy==1.24.0 - - packaging==22.0 - - pandas==1.5.2 - - pandocfilters==1.5.0 - - parso==0.8.3 - - pexpect==4.8.0 - - pickleshare==0.7.5 - - platformdirs==2.6.0 - - prometheus-client==0.15.0 - - prompt-toolkit==3.0.36 - - psutil==5.9.4 - - ptyprocess==0.7.0 - - pure-eval==0.2.2 - - pycparser==2.21 - - pygments==2.13.0 - - pyrsistent==0.19.2 - - python-dateutil==2.8.2 - - python-json-logger==2.0.4 - - pytz==2022.7 - - pyyaml==6.0 - - pyzmq==24.0.1 - - regex==2022.10.31 - - requests==2.28.1 - - rfc3339-validator==0.1.4 - - rfc3986-validator==0.1.1 - - send2trash==1.8.0 - - six==1.16.0 - - sniffio==1.3.0 - - soupsieve==2.3.2.post1 - - stack-data==0.6.2 - - terminado==0.17.1 - - tinycss2==1.2.1 - - tornado==6.2 - - traitlets==5.8.0 - - traittypes==0.2.1 - - uri-template==1.2.0 - - urllib3==1.26.13 - - wcwidth==0.2.5 - - webcolors==1.12 - - webencodings==0.5.1 - - websocket-client==1.4.2 - - widgetsnbextension==4.0.5 - - xyzservices==2022.9.0 - - zipp==3.11.0 + - anyio==3.6.2 + - appnope==0.1.3 + - argon2-cffi==21.3.0 + - argon2-cffi-bindings==21.2.0 + - arrow==1.2.3 + - asttokens==2.2.1 + - attrs==22.2.0 + - babel==2.11.0 + - backcall==0.2.0 + - beautifulsoup4==4.11.1 + - bleach==5.0.1 + - bqplot==0.12.36 + - branca==0.6.0 + - cffi==1.15.1 + - charset-normalizer==2.1.1 + - comm==0.1.2 + - debugpy==1.6.4 + - decorator==5.1.1 + - defusedxml==0.7.1 + - entrypoints==0.4 + - exceptiongroup==1.1.0 + - executing==1.2.0 + - fastjsonschema==2.16.2 + - flatdict==4.0.1 + - fqdn==1.5.1 + - idna==3.4 + - importlib-metadata==5.2.0 + - iniconfig==1.1.1 + - ipykernel==6.19.4 + - ipyleaflet==0.17.2 + - ipython==8.7.0 + - ipython-genutils==0.2.0 + - ipywidgets==8.0.4 + - isoduration==20.11.0 + - jedi==0.18.2 + - jinja2==3.1.2 + - json5==0.9.10 + - jsonpointer==2.3 + - jsonschema==4.17.3 + - jupyter-client==7.4.1 + - jupyter-core==5.1.1 + - jupyter-events==0.5.0 + - jupyter-server==1.23.4 + - jupyter-server-terminals==0.4.3 + - jupyterlab-pygments==0.2.2 + - jupyterlab-server==2.17.0 + - jupyterlab-widgets==3.0.5 + - markupsafe==2.1.1 + - matplotlib-inline==0.1.6 + - mistune==2.0.4 + - nbclassic==0.4.8 + - nbclient==0.7.2 + - nbconvert==7.2.7 + - nbformat==5.7.1 + - nest-asyncio==1.5.6 + - notebook==6.5.2 + - notebook-shim==0.2.2 + - numpy==1.24.0 + - packaging==22.0 + - pandas==1.5.2 + - pandocfilters==1.5.0 + - parso==0.8.3 + - pexpect==4.8.0 + - pickleshare==0.7.5 + - platformdirs==2.6.0 + - pluggy==1.0.0 + - prometheus-client==0.15.0 + - prompt-toolkit==3.0.36 + - psutil==5.9.4 + - ptyprocess==0.7.0 + - pure-eval==0.2.2 + - pycparser==2.21 + - pygments==2.13.0 + - pyrsistent==0.19.2 + - pytest==7.2.0 + - python-dateutil==2.8.2 + - python-dotenv==0.21.0 + - python-json-logger==2.0.4 + - pytz==2022.7 + - pyyaml==6.0 + - pyzmq==24.0.1 + - regex==2022.10.31 + - requests==2.28.1 + - rfc3339-validator==0.1.4 + - rfc3986-validator==0.1.1 + - send2trash==1.8.0 + - six==1.16.0 + - sniffio==1.3.0 + - soupsieve==2.3.2.post1 + - stack-data==0.6.2 + - terminado==0.17.1 + - tinycss2==1.2.1 + - tomli==2.0.1 + - tornado==6.2 + - traitlets==5.8.0 + - traittypes==0.2.1 + - uri-template==1.2.0 + - urllib3==1.26.13 + - voila==0.4.0 + - wcwidth==0.2.5 + - webcolors==1.12 + - webencodings==0.5.1 + - websocket-client==1.4.2 + - websockets==10.4 + - widgetsnbextension==4.0.5 + - xyzservices==2022.9.0 + - zipp==3.11.0 diff --git a/config/requirements.txt b/config/requirements.txt index 670ba2c..42536bb 100644 --- a/config/requirements.txt +++ b/config/requirements.txt @@ -18,11 +18,14 @@ debugpy==1.6.4 decorator==5.1.1 defusedxml==0.7.1 entrypoints==0.4 +exceptiongroup==1.1.0 executing==1.2.0 fastjsonschema==2.16.2 +flatdict==4.0.1 fqdn==1.5.1 idna==3.4 importlib-metadata==5.2.0 +iniconfig==1.1.1 ipykernel==6.19.4 ipyleaflet==0.17.2 ipython==8.7.0 @@ -60,6 +63,7 @@ parso==0.8.3 pexpect==4.8.0 pickleshare==0.7.5 platformdirs==2.6.0 +pluggy==1.0.0 prometheus-client==0.15.0 prompt-toolkit==3.0.36 psutil==5.9.4 @@ -68,7 +72,9 @@ pure-eval==0.2.2 pycparser==2.21 Pygments==2.13.0 pyrsistent==0.19.2 +pytest==7.2.0 python-dateutil==2.8.2 +python-dotenv==0.21.0 python-json-logger==2.0.4 pytz==2022.7 PyYAML==6.0 @@ -84,6 +90,7 @@ soupsieve==2.3.2.post1 stack-data==0.6.2 terminado==0.17.1 tinycss2==1.2.1 +tomli==2.0.1 tornado==6.2 traitlets==5.8.0 traittypes==0.2.1 diff --git a/dashboard/Sugartrail.ipynb b/dashboard/Sugartrail.ipynb index 4032d07..0ba5f18 100644 --- a/dashboard/Sugartrail.ipynb +++ b/dashboard/Sugartrail.ipynb @@ -130,8 +130,7 @@ " api.basic_auth.username = API_input.value\n", " response = api.get_company(str(company_text.value))\n", " if response:\n", - " network = base.Network(company_id=str(company_text.value))\n", - "# network.company_id = str(company_text.value)\n", + " network.company_id = str(company_text.value)\n", " init_status.value = u'\\u2705: Initialisation successful for ' + str(response['company_name']) \n", " depth_selector.disabled = False\n", " generate_network_button.disabled = False\n", @@ -171,7 +170,7 @@ " with output_box:\n", " depth_selector.disabled = True\n", " generate_network_button.disabled = True\n", - " network.perform_hop(depth_selector.value+1)\n", + " network.perform_hop(depth_selector.value)\n", " network.run_map_preprocessing()\n", " build_map_button.disabled = False\n", " \n", diff --git a/sugartrail/api.py b/sugartrail/api.py index daaf43e..2a885a9 100644 --- a/sugartrail/api.py +++ b/sugartrail/api.py @@ -22,7 +22,6 @@ def make_request(url, input, input_type, response_type): try: response = requests.get(url, auth=basic_auth) response.raise_for_status() - # print("here") if response.status_code == 200: return response.json() except requests.exceptions.RequestException as err: diff --git a/sugartrail/mapview.py b/sugartrail/mapview.py index abc51cc..d915249 100644 --- a/sugartrail/mapview.py +++ b/sugartrail/mapview.py @@ -11,7 +11,6 @@ def build_map(network, clear_widget=True): return m, path_table def get_address_path(network, company_id): - # company_address_history = network.address_history.loc[network.address_history['company_number'] == company_id] company_address_history = list(filter(lambda d: d.get('company_number') == company_id, network.address_history)) company_address_history_sorted = sorted(company_address_history, key=lambda d: d['start_date'], reverse=True) address_path = []