Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
196 commits
Select commit Hold shift + click to select a range
4142715
added pipy mirror config
Dmitry-Grachev May 16, 2025
36c2cf3
build and deploy workflow added
Dmitry-Grachev May 16, 2025
3308d48
fix("blocksnet_service):
LeonDeTur May 26, 2025
35f2d89
refactor(WIP): moved some files, changed some logic, WIP
Voronapxl Jun 25, 2025
933b619
refactor(WIP_2): added some services for main logic
Voronapxl Jun 26, 2025
651ae54
refactor(structure):
LeonDeTur Jun 26, 2025
299a6a9
refactor(WIP_3): schematic for development parameters evaluation
Voronapxl Jun 26, 2025
7e8d058
Merge branch 'refactor/new_blocksnet_version' of https://github.com/I…
Voronapxl Jun 26, 2025
8510095
feat(blocksnet_service):
LeonDeTur Jun 27, 2025
2311f8a
feat(development_dto):
LeonDeTur Jun 27, 2025
8d402f2
feat(effects_controller):
LeonDeTur Jun 27, 2025
2e29ac7
feat(effects_service):
LeonDeTur Jun 27, 2025
40109ce
refactor(WIP_4_buildings_parameters): working logic for buidiings par…
Voronapxl Jun 27, 2025
52794a8
feat(temp_commit): adding logic for generating context and scenario u…
Voronapxl Jun 27, 2025
db99061
feat(effects_service):
LeonDeTur Jun 27, 2025
a220cdd
refactor(WIP_4):
Voronapxl Jun 29, 2025
01bf375
feat(effects_service):
LeonDeTur Jun 29, 2025
553b3e1
Merge remote-tracking branch 'origin/dev' into refactor/new_blocksnet…
LeonDeTur Jun 30, 2025
42642c1
refactor(system_controller):
LeonDeTur Jun 30, 2025
c499896
refactor(controller_exception_handler):
LeonDeTur Jun 30, 2025
6671298
refactor(json_api_handler):
LeonDeTur Jun 30, 2025
77ab104
refactor(scenario_service):
LeonDeTur Jun 30, 2025
d3937a2
refactor(scenario_service):
LeonDeTur Jun 30, 2025
e9ff41d
refactor(json_api_handler):
LeonDeTur Jun 30, 2025
6503c63
chore(requirements):
LeonDeTur Jun 30, 2025
9af90f8
refactor(effects_controller):
LeonDeTur Jun 30, 2025
56de0ff
chore(json_api_handler):
LeonDeTur Jun 30, 2025
0536043
style:
LeonDeTur Jun 30, 2025
4d50c4e
chore(gitignore):
LeonDeTur Jun 30, 2025
4a0ecd9
chore(system_controller):
LeonDeTur Jun 30, 2025
b947510
feat(scenario logic):
Voronapxl Jun 30, 2025
cba151b
feat(scenario logic):
Voronapxl Jun 30, 2025
c7fb509
feat(constants):
Voronapxl Jun 30, 2025
157298c
refactor(dockerfile):
LeonDeTur Jun 30, 2025
d460d51
Merge remote-tracking branch 'origin/refactor/new_blocksnet_version' …
LeonDeTur Jun 30, 2025
7ea0c54
style:
LeonDeTur Jun 30, 2025
2ac498b
Merge pull request #1 from IDUclub/refactor/new_blocksnet_version
LeonDeTur Jul 1, 2025
1a11fab
fix(dependencies):
LeonDeTur Jul 1, 2025
0fe5009
feat(maps):
LeonDeTur Jul 1, 2025
22a2c62
refactor(effects+controller):
LeonDeTur Jul 1, 2025
165d88f
refactor(exception_handler):
LeonDeTur Jul 1, 2025
a1dd63c
feat(exception_handler):
LeonDeTur Jul 1, 2025
6b6abd7
style:
LeonDeTur Jul 1, 2025
f055c35
chore(context):
LeonDeTur Jul 1, 2025
5ed40e0
refactor(effects_service):
LeonDeTur Jul 1, 2025
bf96466
refactor(exception_handler):
LeonDeTur Jul 2, 2025
34be9a1
Merge pull request #2 from IDUclub/refactor/soci_eceonomic_prediction
LeonDeTur Jul 2, 2025
fe74702
fix(socio_economic_response_schema):
LeonDeTur Jul 2, 2025
3c1236f
fix(Dockerfile):
LeonDeTur Jul 2, 2025
464c45d
refactor(tmp_commit): testing for F35
Voronapxl Jul 2, 2025
5642327
fix(main):
LeonDeTur Jul 3, 2025
34183b2
fix(auth):
LeonDeTur Jul 3, 2025
badd1cb
fix(effects_service):
LeonDeTur Jul 4, 2025
39ae4a7
feat(tmp_commit_2):
Voronapxl Jul 8, 2025
e6d33ce
feat(tmp_commit_3):
Voronapxl Jul 8, 2025
c88b99a
feat(tmp_commit_4):
Voronapxl Jul 9, 2025
3c01d7b
feat(tmp_commit_5): pre-fix commit
Voronapxl Jul 9, 2025
624b885
fix(tmp_commit_6): main logic fixes
Voronapxl Jul 10, 2025
9e5f12d
fix(tmp_commit_7): main logic fixes
Voronapxl Jul 10, 2025
5d9932c
fix(tmp_commit_7): main logic fixes
Voronapxl Jul 10, 2025
12b563b
fix(urban_api): redirected context requests from projects to scenarios
Voronapxl Aug 18, 2025
21f5c9f
fix(effects_controller): renamed router
Voronapxl Aug 18, 2025
0739c43
feat(effects_service): added logic for calculation of values developm…
Voronapxl Aug 18, 2025
fcce1ce
feat(f_36_logic): testing logic for f 36
Voronapxl Aug 21, 2025
4aab46c
feat(values_oriented_requirements): values oriented requirements deve…
Voronapxl Aug 21, 2025
da7f5c3
feat(main logic):
Voronapxl Aug 22, 2025
0ef5c60
Merge branch 'dev' into feat/f36
Voronapxl Sep 2, 2025
cb53477
fix(f_36_logic):
Voronapxl Sep 2, 2025
b144514
fix(commit_history):
Voronapxl Sep 2, 2025
70cd888
feat(tasks_controller):
Voronapxl Sep 2, 2025
c7dbd10
fix(dto):
Voronapxl Sep 3, 2025
333f0e6
Merge pull request #4 from IDUclub/feat/f36
Voronapxl Sep 5, 2025
18edff9
feat(service_type_router):
Voronapxl Sep 5, 2025
a469a2a
fix(social_values):
Voronapxl Sep 7, 2025
e5cb365
feat(effects_service):
Voronapxl Sep 7, 2025
aa655ec
feat(project_evaluation):
Voronapxl Sep 7, 2025
24914ee
feat(comment_fixes):
Voronapxl Sep 10, 2025
a4e15fb
feat(comment_fixes_2):
Voronapxl Sep 11, 2025
44ee41b
fix(comment_fixes_3):
Voronapxl Sep 11, 2025
cad59a3
Merge pull request #6 from IDUclub/fix/f_22
Voronapxl Sep 11, 2025
e547bad
feat(f_36):
Voronapxl Sep 12, 2025
43a1454
fix(get_values_oriented_requirements_layer):
Voronapxl Sep 12, 2025
a3bccb6
fix(round_coords):
Voronapxl Sep 12, 2025
c102819
Merge pull request #8 from IDUclub/feat/f_36_response
Voronapxl Sep 12, 2025
7d5303c
fix(task_status):
Voronapxl Sep 15, 2025
ef48845
fix(tasks):
Voronapxl Sep 16, 2025
ca6e434
feat(effects):
Voronapxl Sep 18, 2025
8ab573d
fix(exception_handlers):
Voronapxl Sep 19, 2025
fafc03c
fix(exceptions):
Voronapxl Sep 19, 2025
9a26737
fix(constants):
Voronapxl Sep 19, 2025
ee88802
Merge pull request #11 from IDUclub/feat/f_35_project_territories
Voronapxl Sep 19, 2025
a97bade
fix(tasks):
Voronapxl Sep 21, 2025
c9ab738
Merge pull request #13 from IDUclub/fix/f_35_after_return
Voronapxl Sep 24, 2025
b4511a1
fix(effects_logic):
Voronapxl Sep 24, 2025
b458c93
fix(effects_logic):
Voronapxl Sep 26, 2025
73f4800
fix(task_status):
Voronapxl Sep 26, 2025
54390db
Merge pull request #14 from IDUclub/fix/f_35_after_return
Voronapxl Sep 26, 2025
1fc7209
fix(effects_service_cache):
Voronapxl Sep 30, 2025
7622dbe
feat(get_provisions):
Voronapxl Sep 30, 2025
c12cae0
feat(values_oriented):
Voronapxl Oct 1, 2025
586a91b
feat(social_values):
Voronapxl Oct 1, 2025
2b0a78b
fix(base_roads):
Voronapxl Oct 2, 2025
a64f3f9
fix(forced):
Voronapxl Oct 2, 2025
a2c0a70
fix(create_task):
Voronapxl Oct 2, 2025
95e3b32
Merge branch 'dev' of https://github.com/IDUclub/EffectsAPI into fix/…
Voronapxl Oct 2, 2025
9cc3d49
Merge branch 'feat/base_scenario_soc_value' into fix/base_roads_exclu…
Voronapxl Oct 3, 2025
d29b380
Merge pull request #15 from IDUclub/fix/base_roads_exclusion
Voronapxl Oct 3, 2025
0ee04b7
fix(run_values_oriented_requirements):
Voronapxl Oct 3, 2025
846538d
Merge branch 'feat/base_scenario_soc_value' of https://github.com/IDU…
Voronapxl Oct 3, 2025
82a29be
fix(F_36_service_types):
Voronapxl Oct 6, 2025
300f778
fix(F_36_layers):
Voronapxl Oct 6, 2025
3b89eeb
feat(F_36_layers):
Voronapxl Oct 6, 2025
200cb25
Merge pull request #16 from IDUclub/feat/base_scenario_soc_value
Voronapxl Oct 7, 2025
8ef862f
fix(effects_logic):
Voronapxl Oct 7, 2025
a5e322b
feat(f26_logic):
Voronapxl Oct 8, 2025
24655fb
feat(landuse_prediction):
Voronapxl Oct 14, 2025
8753d55
test_commit
Voronapxl Oct 15, 2025
915572c
feat(landuse_prediction):
Voronapxl Oct 16, 2025
0e185c6
Merge branch 'dev' of https://github.com/IDUclub/EffectsAPI into feat…
Voronapxl Oct 16, 2025
8664a84
Merge pull request #17 from IDUclub/feat/landuse_prediction
Voronapxl Oct 16, 2025
b7a2271
fix(requirements):
Voronapxl Oct 16, 2025
c7e1498
Merge branch 'dev' of https://github.com/IDUclub/EffectsAPI into dev
Voronapxl Oct 16, 2025
2d0090a
fix(requirements):
Voronapxl Oct 16, 2025
0a89608
feat(f_22): new f 22
Voronapxl Oct 20, 2025
2a6ba42
fat(f_22):
Voronapxl Oct 22, 2025
ebbae67
feat(f_22): tmp_logic
Voronapxl Oct 24, 2025
75c8393
fat(f_22):
Voronapxl Oct 27, 2025
503eaac
feat(effects_logic):
Voronapxl Oct 27, 2025
8b65d12
feat(f22):
Voronapxl Oct 27, 2025
800b67c
feat(effects_logic): small fixes
Voronapxl Oct 28, 2025
cb269c1
feat(f22):
Voronapxl Oct 29, 2025
852251d
fix(f36):
Voronapxl Oct 29, 2025
22dde9d
fix(f35):
Voronapxl Oct 29, 2025
9cd83c9
feat(response_schema):
Voronapxl Oct 30, 2025
bb752d5
fix(response_schema):
Voronapxl Oct 30, 2025
c3f5819
fix(main):
Voronapxl Oct 30, 2025
9a06aec
pypi mirror config changed
Dmitry-Grachev Oct 31, 2025
07be102
fix(comments_tmp):
Voronapxl Oct 31, 2025
5aab729
fix(comment_fixes):
Voronapxl Oct 31, 2025
998632e
fix(comment_fixes):
Voronapxl Oct 31, 2025
bcdce05
fix(comment_fixes):
Voronapxl Nov 2, 2025
705cd06
feat(effects_logic): updates for F22 and new blocksnet version
Voronapxl Nov 2, 2025
e9a2874
fix(get_from_cache):
Voronapxl Nov 7, 2025
418ae20
feat(mapping_f22):
Voronapxl Nov 25, 2025
06a6b65
fix(for):
Voronapxl Nov 25, 2025
de0e255
Merge pull request #19 from IDUclub/feat/f22_indicators_mapping
Voronapxl Nov 25, 2025
f1b09ff
feat(f_22):
Voronapxl Nov 27, 2025
29662d2
feat(Urbanomy):
Voronapxl Dec 4, 2025
e7b943f
feat(Urbanomy):
Voronapxl Dec 4, 2025
7c3241b
fix(values_oriented_requirements):
Voronapxl Dec 5, 2025
239e540
fix(tasks_controller):
Voronapxl Dec 5, 2025
1ca2a0c
fix(f_22):
Voronapxl Dec 5, 2025
c73abe1
Merge branch 'dev' of https://github.com/IDUclub/EffectsAPI into feat…
Voronapxl Dec 5, 2025
01f0911
feat(f_22_urb_with_fix):
Voronapxl Dec 5, 2025
c562cf1
Merge branch 'feat/f_22_economics' into fix/f_22_regional_scenario_fix
Voronapxl Dec 5, 2025
71db32f
Merge pull request #20 from IDUclub/fix/f_22_regional_scenario_fix
Voronapxl Dec 5, 2025
373e8fa
feat(create_project_task):
Voronapxl Dec 8, 2025
15eadf0
feat(f_22):
Voronapxl Dec 9, 2025
c422e3f
Merge pull request #21 from IDUclub/feat/f_22_economics
Voronapxl Dec 10, 2025
2db25bd
feat(features):
Voronapxl Dec 10, 2025
9f14a3d
Merge pull request #22 from IDUclub/feat/additional_features
Voronapxl Dec 11, 2025
761c8c5
fix(build_hash_params):
Voronapxl Dec 12, 2025
39a81f2
fix(evaluate_social_economical_metrics):
Voronapxl Dec 12, 2025
c8aa398
fix(evaluate_social_economical_metrics):
Voronapxl Dec 12, 2025
b3ed7b4
fix(response):
Voronapxl Dec 15, 2025
d27432a
Merge pull request #23 from IDUclub/fix/additional_fixes
Voronapxl Dec 15, 2025
e5a0af4
fix(scenario_service):
Voronapxl Dec 15, 2025
91cfdc0
fix(context_service):
Voronapxl Dec 16, 2025
3e24590
fix(fixes):
Voronapxl Dec 17, 2025
a0813be
fix(fixes):
Voronapxl Dec 17, 2025
10772ef
fix(fixes):
Voronapxl Dec 17, 2025
b593dae
fix(F22):
Voronapxl Dec 17, 2025
90b62af
fix(blocks):
Voronapxl Dec 18, 2025
6c99943
feat(broker):
Voronapxl Dec 18, 2025
1471d44
Merge branch 'dev' of https://github.com/IDUclub/EffectsAPI into dev
Voronapxl Dec 19, 2025
88601e1
fix(blocks):
Voronapxl Dec 19, 2025
ce988ad
Merge branch 'dev' of https://github.com/IDUclub/EffectsAPI into feat…
Voronapxl Dec 19, 2025
6d15a23
feat(broker):
Voronapxl Dec 19, 2025
6141d6b
fix(broker):
Voronapxl Dec 20, 2025
117a808
fix(broker):
Voronapxl Dec 20, 2025
eabd9c2
fix(f35):
Voronapxl Dec 20, 2025
7441e74
fix(f35):
Voronapxl Dec 21, 2025
ba005d9
Merge branch 'feat/broker' of https://github.com/IDUclub/EffectsAPI i…
Voronapxl Dec 21, 2025
5839f6e
feat(producer):
Voronapxl Dec 21, 2025
07ac6a8
feat(producer):
Voronapxl Dec 21, 2025
06fd679
Merge branch 'feat/broker' of https://github.com/IDUclub/EffectsAPI i…
Voronapxl Dec 21, 2025
b6b6966
fix(worker):
Voronapxl Dec 21, 2025
c6995c3
fix(f35):
Voronapxl Dec 22, 2025
a699eb7
feat(broker):
Voronapxl Dec 22, 2025
8a6bcb0
Merge pull request #24 from IDUclub/feat/broker
Voronapxl Dec 23, 2025
c9dd562
Merge pull request #25 from IDUclub/fix/territory_transformation
Voronapxl Dec 23, 2025
447582d
feat(prometheus):
Voronapxl Dec 24, 2025
4208c0e
feat(prometheus_metrics):
Voronapxl Jan 14, 2026
7c99998
feat(review_changes):
Voronapxl Jan 15, 2026
89fb1c8
Merge pull request #26 from IDUclub/feat/prometheus
Voronapxl Jan 15, 2026
258513a
runner changed to 102_runner, docker-compose.actions.yml updated
Dmitry-Grachev Jan 15, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: build_and_deploy
on: workflow_dispatch
env:
IMAGE_NAME: ${{secrets.REGISTRY}}/effects_api
CONTAINER_NAME: effects_api

jobs:
build:
runs-on: 102_runner
outputs:
now: ${{steps.date.outputs.NOW}}
steps:
- name: Set current date as env variable
id: date
run: echo "NOW=$(date +'%Y-%m-%dT%H-%M-%S')" >> $GITHUB_OUTPUT
- name: checkout
uses: actions/checkout@v4
- name: copy_env
env:
ENV_PATH: ${{secrets.ENV_PATH}}
run: cp "$ENV_PATH"/.env.production ./
- name: build
env:
NOW: ${{steps.date.outputs.now}}
run: docker build -t "$IMAGE_NAME":"$NOW" .
- name: push_to_registry
env:
NOW: ${{steps.date.outputs.now}}
run: docker push "$IMAGE_NAME":"$NOW"
stop_container:
runs-on: 102_runner
needs: build
steps:
- name: stop_container
run: docker rm -f "$CONTAINER_NAME"
run_container:
runs-on: 102_runner
needs: [build, stop_container]
env:
NOW: ${{needs.build.outputs.now}}
steps:
- name: set env
run: echo "IMAGE=$IMAGE_NAME:$NOW" >> $GITHUB_ENV
- name: run
run: docker compose -f docker-compose.actions.yml up -d
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ target/
# IPython
profile_default/
ipython_config.py
*.ipynb

# pyenv
# For a library or package, you might want to ignore these files since the code is
Expand Down Expand Up @@ -125,8 +126,7 @@ celerybeat.pid
*.sage.py

# Environments
app/.env.development
.env.development
.env.*
.venv
env/
venv/
Expand Down Expand Up @@ -171,3 +171,4 @@ gdf_with_obj.geojson
boundaries.parquet
roads.parquet
water.parquet
__effects_cache__
13 changes: 13 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
repos:
- repo: https://github.com/psf/black
rev: 25.1.0
hooks:
- id: black
language_version: python3.11

- repo: https://github.com/pycqa/isort
rev: 6.0.1
hooks:
- id: isort
name: isort (python)
args: ["--profile", "black"]
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ ENV PYTHONDONTWRITEBYTECODE=1
ENV PYTHONUNBUFFERED=1

# Enables env file
ENV APP_ENV=development
ENV APP_ENV=production

#add pypi mirror to config
COPY pip.conf /etc/xdg/pip/pip.conf

# Install pip requirements
COPY requirements.txt .
Expand All @@ -23,4 +26,4 @@ WORKDIR /app
COPY . /app

# During debugging, this entry point will be overridden. For more information, please refer to https://aka.ms/vscode-docker-python-debug
CMD ["gunicorn", "--bind", "0.0.0.0:80", "-k", "uvicorn.workers.UvicornWorker", "--workers", "2", "app.main:app"]
CMD ["sh", "-c", "gunicorn --bind 0.0.0.0:80 -k uvicorn.workers.UvicornWorker --workers 1 --timeout 600 app.main:app"]
200 changes: 0 additions & 200 deletions app/api/routers/effects/effects_controller.py

This file was deleted.

26 changes: 0 additions & 26 deletions app/api/routers/effects/effects_models.py

This file was deleted.

Loading