anydev/anyway
0
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Merge modifications for more separate backend functions #69

Open
kscheidecker wants to merge 39 commits from backend/micro-services-restructuring into main
pull from: backend/micro-services-restructuring
merge into: anydev:main
Conversation 1 Commits 39 Files Changed 47 +15 -8
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 19b0c37a97 - Show all commits

6
.gitea/workflows/backend_run_test.yaml
View File

@@ -18,17 +18,17 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
apt-get update && apt-get install -y python3 python3-pip apt-get update && apt-get install -y python3 python3-pip
pip install pipenv pip install uv
remoll commented 2025-09-26 11:42:40 +00:00
Review
Copy Link

Using the uv action would be cleaner:

      - name: Install uv
        uses: astral-sh/setup-uv@v6
Using the uv action would be cleaner: ``` - name: Install uv uses: astral-sh/setup-uv@v6 ```
remoll commented 2025-09-26 11:43:23 +00:00
Review
Copy Link

See https://docs.astral.sh/uv/guides/integration/github/#installation

See https://docs.astral.sh/uv/guides/integration/github/#installation
remoll commented 2025-09-26 11:51:28 +00:00
Review
Copy Link

Using this works in the backend_run_lint.yaml step as well. Just run uv run pylint ....

Using this works in the `backend_run_lint.yaml` step as well. Just run `uv run pylint ...`.
- name: Install packages - name: Install packages
run: | run: |
ls -la ls -la
# install all packages, including dev-packages # install all packages, including dev-packages
pipenv install --dev uv sync
working-directory: backend working-directory: backend
- name: Run Tests - name: Run Tests
run: pipenv run pytest src --html=report.html --self-contained-html --log-cli-level=DEBUG run: uv run pytest src --html=report.html --self-contained-html --log-cli-level=DEBUG
working-directory: backend working-directory: backend
- name: Upload HTML report - name: Upload HTML report

6
backend/main.py Normal file
View File

@@ -0,0 +1,6 @@
def main():
print("Hello from backend!")
if __name__ == "__main__":
main()

6
backend/src/optimization/optimization_router.py
View File

@@ -114,9 +114,11 @@ def optimize_trip(
# Second stage optimization # Second stage optimization
try : try :
refined_tour = refiner.refine_optimization(landmarks, base_tour, refined_tour = refiner.refine_optimization(
landmarks, base_tour,
preferences.max_time_minute, preferences.max_time_minute,
preferences.detour_tolerance_minute) preferences.detour_tolerance_minute
)
except Exception as exc : except Exception as exc :
logger.warning(f"Refiner failed. Proceeding with base trip {str(exc)}") logger.warning(f"Refiner failed. Proceeding with base trip {str(exc)}")
refined_tour = base_tour refined_tour = base_tour

3
backend/src/optimization/refiner.py
View File

@@ -6,7 +6,6 @@ from shapely import buffer, LineString, Point, Polygon, MultiPoint, concave_hull
from ..structs.landmark import Landmark from ..structs.landmark import Landmark
from ..utils.get_time_distance import get_time from ..utils.get_time_distance import get_time
from ..utils.take_most_important import take_most_important
from .optimizer import Optimizer from .optimizer import Optimizer
from ..constants import OPTIMIZER_PARAMETERS_PATH from ..constants import OPTIMIZER_PARAMETERS_PATH
@@ -238,7 +237,7 @@ class Refiner :
if self.is_in_area(area, landmark.location) and landmark.name not in visited_names: if self.is_in_area(area, landmark.location) and landmark.name not in visited_names:
second_order_landmarks.append(landmark) second_order_landmarks.append(landmark)
return take_most_important(second_order_landmarks, int(self.max_landmarks_refiner*0.75)) return sorted(second_order_landmarks, key=lambda x: x.attractiveness, reverse=True)[:int(self.max_landmarks_refiner*0.75)]
# Try fix the shortest path using shapely # Try fix the shortest path using shapely