Check executor change

.github/workflows/Tests.yml

@@ -27,7 +27,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.8'
+        python-version: '3.10'
     - name: Install Dependencies
       run: |
         python -m pip install --upgrade pip
@@ -42,7 +42,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.8'
+        python-version: '3.10'
     - name: Install Dependencies
       run: |
         pip install -r test_requirements.txt

.github/workflows/deploy.yml

@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - master
-      - dev
+      - new-cbs-format
 env:
   DOCKER_REPOSITORY_ANYWAY: "${{ github.repository }}/anyway"
   DOCKER_REPOSITORY_DB: "${{ github.repository }}/db"
@@ -88,7 +88,7 @@ jobs:
         DFC_IAC_DEPLOY_KEY: ${{ secrets.DFC_IAC_DEPLOY_KEY }}
         ANYWAY_ETL_DEPLOY_KEY: ${{ secrets.ANYWAY_ETL_DEPLOY_KEY }}
       run: |
-        if [ "${GITHUB_REF}" == "refs/heads/master" ] || [ "${GITHUB_REF}" == "refs/heads/dev" ]; then
+        if [ "${GITHUB_REF}" == "refs/heads/master" ] || [ "${GITHUB_REF}" == "refs/heads/new-cbs-format" ]; then
           SHA_TAG=sha-`git rev-parse --short $GITHUB_SHA` &&\
           echo SHA_TAG=$SHA_TAG &&\
           ANYWAY_IMAGE="${DOCKER_REPOSITORY_ANYWAY}:${SHA_TAG}" &&\
@@ -102,7 +102,7 @@ jobs:
           if ! git log -1 --pretty=format:"%s" | grep -- --no-deploy; then
             git config --global user.name "Anyway CI" &&\
             git config --global user.email "anyway-ci@localhost" &&\
-            if [ "${GITHUB_REF}" == "refs/heads/master" ] || [ "${GITHUB_REF}" == "refs/heads/dev" ]; then
+            if [ "${GITHUB_REF}" == "refs/heads/master" ] || [ "${GITHUB_REF}" == "refs/heads/new-cbs-format" ]; then
               cd `mktemp -d` &&\
               echo "${DFC_IAC_DEPLOY_KEY}" > dfc_iac_deploy_key &&\
               chmod 400 dfc_iac_deploy_key &&\

.gitignore

@@ -62,6 +62,7 @@ venv
 
 /.vscode
 /.env*
+/.devcontainer
 
 
 GOOGLE_APPLICATION_CREDENTIALS_KEY.json

Dockerfile

@@ -1,21 +1,21 @@
-FROM ubuntu:20.04 AS builder
+FROM python:3.10-slim-bookworm AS builder
 
 # Install system tools
 RUN apt-get clean && \
     apt-get -y update && \
     apt-get install -y \
-        python3-dev \
         build-essential \
         libpq-dev \
-        virtualenv && \
+        binutils \
+        postgresql-client && \
     apt-get clean
 
 WORKDIR /anyway
 
 COPY requirements.txt /anyway
 
 # We create the venv inside a builder container to avoid pulling in build deps into final image
-RUN virtualenv /venv3 -p python3
+RUN python -m venv /venv3
 RUN . /venv3/bin/activate && \
                     pip install -U setuptools wheel && \
                     pip install --upgrade pip && \
@@ -24,13 +24,12 @@ RUN . /venv3/bin/activate && \
 RUN find /venv3 -name '*.so' | xargs strip
 
 
-FROM ubuntu:20.04 AS runtime
+FROM python:3.10-slim-bookworm AS runtime
 
 RUN apt-get clean && \
     apt-get -y update && \
     apt-get install -y \
-        postgresql-client \
-        virtualenv && \
+        postgresql-client && \
     apt-get clean
 
 WORKDIR /anyway
@@ -47,7 +46,5 @@ COPY . /anyway
 
 EXPOSE 5000
 
-RUN flask assets clean
-
 ENTRYPOINT ["/anyway/docker-entrypoint.sh"]
 CMD FLASK_APP=anyway flask run --host 0.0.0.0

alembic/versions/205025444ebe_removing_cross_columns_from_markers.py

@@ -0,0 +1,76 @@
+"""removing cross columns from markers
+
+Revision ID: 205025444ebe
+Revises: 237ab8f171d0
+Create Date: 2026-02-12 21:29:57.945021
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "205025444ebe"
+down_revision = "237ab8f171d0"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # markers
+    op.drop_column("markers", "cross_location")
+    op.drop_column("markers", "cross_direction")
+    op.drop_column("markers", "didnt_cross")
+    op.drop_column("markers", "cross_mode")
+
+    # markers_hebrew
+    op.drop_column("markers_hebrew", "cross_location")
+    op.drop_column("markers_hebrew", "cross_direction")
+    op.drop_column("markers_hebrew", "didnt_cross")
+    op.drop_column("markers_hebrew", "cross_mode")
+
+    op.drop_column("markers_hebrew", "cross_location_hebrew")
+    op.drop_column("markers_hebrew", "cross_direction_hebrew")
+    op.drop_column("markers_hebrew", "didnt_cross_hebrew")
+    op.drop_column("markers_hebrew", "cross_mode_hebrew")
+
+    # vehicles_markers_hebrew
+    op.drop_column("vehicles_markers_hebrew", "cross_location")
+    op.drop_column("vehicles_markers_hebrew", "cross_direction")
+    op.drop_column("vehicles_markers_hebrew", "didnt_cross")
+    op.drop_column("vehicles_markers_hebrew", "cross_mode")
+
+    op.drop_column("vehicles_markers_hebrew", "cross_location_hebrew")
+    op.drop_column("vehicles_markers_hebrew", "cross_direction_hebrew")
+    op.drop_column("vehicles_markers_hebrew", "didnt_cross_hebrew")
+    op.drop_column("vehicles_markers_hebrew", "cross_mode_hebrew")
+
+
+def downgrade():
+    # markers
+    op.add_column("markers", sa.Column("cross_location", sa.Integer(), nullable=True))
+    op.add_column("markers", sa.Column("cross_direction", sa.Integer(), nullable=True))
+    op.add_column("markers", sa.Column("didnt_cross", sa.Integer(), nullable=True))
+    op.add_column("markers", sa.Column("cross_mode", sa.Integer(), nullable=True))
+
+    # markers_hebrew
+    op.add_column("markers_hebrew", sa.Column("cross_location", sa.Integer(), nullable=True))
+    op.add_column("markers_hebrew", sa.Column("cross_direction", sa.Integer(), nullable=True))
+    op.add_column("markers_hebrew", sa.Column("didnt_cross", sa.Integer(), nullable=True))
+    op.add_column("markers_hebrew", sa.Column("cross_mode", sa.Integer(), nullable=True))
+
+    op.add_column("markers_hebrew", sa.Column("cross_location_hebrew", sa.Text(), nullable=True))
+    op.add_column("markers_hebrew", sa.Column("cross_direction_hebrew", sa.Text(), nullable=True))
+    op.add_column("markers_hebrew", sa.Column("didnt_cross_hebrew", sa.Text(), nullable=True))
+    op.add_column("markers_hebrew", sa.Column("cross_mode_hebrew", sa.Text(), nullable=True))
+
+    # vehicles_markers_hebrew
+    op.add_column("vehicles_markers_hebrew", sa.Column("cross_location", sa.Integer(), nullable=True))
+    op.add_column("vehicles_markers_hebrew", sa.Column("cross_direction", sa.Integer(), nullable=True))
+    op.add_column("vehicles_markers_hebrew", sa.Column("didnt_cross", sa.Integer(), nullable=True))
+    op.add_column("vehicles_markers_hebrew", sa.Column("cross_mode", sa.Integer(), nullable=True))
+
+    op.add_column("vehicles_markers_hebrew", sa.Column("cross_location_hebrew", sa.Text(), nullable=True))
+    op.add_column("vehicles_markers_hebrew", sa.Column("cross_direction_hebrew", sa.Text(), nullable=True))
+    op.add_column("vehicles_markers_hebrew", sa.Column("didnt_cross_hebrew", sa.Text(), nullable=True))
+    op.add_column("vehicles_markers_hebrew", sa.Column("cross_mode_hebrew", sa.Text(), nullable=True))

alembic/versions/237ab8f171d0_adding_cross_columns_to_involved.py

@@ -0,0 +1,54 @@
+"""adding cross columns to involved
+
+Revision ID: 237ab8f171d0
+Revises: ef951922e4ef
+Create Date: 2026-02-12 20:56:58.410115
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision = "237ab8f171d0"
+down_revision = "ef951922e4ef"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # involved (raw)
+    op.add_column("involved", sa.Column("cross_direction", sa.Integer(), nullable=True))
+    op.add_column("involved", sa.Column("cross_location", sa.Integer(), nullable=True))
+    op.add_column("involved", sa.Column("cross_mode", sa.Integer(), nullable=True))
+    op.add_column("involved", sa.Column("didnt_cross", sa.Integer(), nullable=True))
+
+    # involved_hebrew (decorated)
+    op.add_column("involved_hebrew", sa.Column("cross_direction", sa.Integer(), nullable=True))
+    op.add_column("involved_hebrew", sa.Column("cross_direction_hebrew", sa.Text(), nullable=True))
+
+    op.add_column("involved_hebrew", sa.Column("cross_location", sa.Integer(), nullable=True))
+    op.add_column("involved_hebrew", sa.Column("cross_location_hebrew", sa.Text(), nullable=True))
+
+    op.add_column("involved_hebrew", sa.Column("cross_mode", sa.Integer(), nullable=True))
+    op.add_column("involved_hebrew", sa.Column("cross_mode_hebrew", sa.Text(), nullable=True))
+
+    op.add_column("involved_hebrew", sa.Column("didnt_cross", sa.Integer(), nullable=True))
+    op.add_column("involved_hebrew", sa.Column("didnt_cross_hebrew", sa.Text(), nullable=True))
+
+
+def downgrade():
+    # involved_hebrew
+    op.drop_column("involved_hebrew", "didnt_cross_hebrew")
+    op.drop_column("involved_hebrew", "didnt_cross")
+    op.drop_column("involved_hebrew", "cross_mode_hebrew")
+    op.drop_column("involved_hebrew", "cross_mode")
+    op.drop_column("involved_hebrew", "cross_location_hebrew")
+    op.drop_column("involved_hebrew", "cross_location")
+    op.drop_column("involved_hebrew", "cross_direction_hebrew")
+    op.drop_column("involved_hebrew", "cross_direction")
+
+    # involved
+    op.drop_column("involved", "didnt_cross")
+    op.drop_column("involved", "cross_mode")
+    op.drop_column("involved", "cross_location")
+    op.drop_column("involved", "cross_direction")

alembic/versions/333a785776cd_add_new_dictionary_tables.py

@@ -0,0 +1,96 @@
+"""Add new dictionary tables
+
+Revision ID: 333a785776cd
+Revises: b7c8d9e0f1a2
+Create Date: 2026-02-02 17:47:20.438985
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '333a785776cd'
+down_revision = 'b7c8d9e0f1a2'
+branch_labels = None
+depends_on = None
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('entrance_exit',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('year', sa.Integer(), nullable=False),
+    sa.Column('provider_code', sa.Integer(), nullable=False),
+    sa.Column('entrance_exit_hebrew', sa.Text(), nullable=True),
+    sa.PrimaryKeyConstraint('id', 'year', 'provider_code')
+    )
+    op.create_index(op.f('ix_entrance_exit_id'), 'entrance_exit', ['id'], unique=False)
+    op.create_index(op.f('ix_entrance_exit_provider_code'), 'entrance_exit', ['provider_code'], unique=False)
+    op.create_index(op.f('ix_entrance_exit_year'), 'entrance_exit', ['year'], unique=False)
+    op.create_table('infrastructure_type',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('year', sa.Integer(), nullable=False),
+    sa.Column('provider_code', sa.Integer(), nullable=False),
+    sa.Column('infrastructure_type_hebrew', sa.Text(), nullable=True),
+    sa.PrimaryKeyConstraint('id', 'year', 'provider_code')
+    )
+    op.create_index(op.f('ix_infrastructure_type_id'), 'infrastructure_type', ['id'], unique=False)
+    op.create_index(op.f('ix_infrastructure_type_provider_code'), 'infrastructure_type', ['provider_code'], unique=False)
+    op.create_index(op.f('ix_infrastructure_type_year'), 'infrastructure_type', ['year'], unique=False)
+    op.create_table('road_alignment',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('year', sa.Integer(), nullable=False),
+    sa.Column('provider_code', sa.Integer(), nullable=False),
+    sa.Column('road_alignment_hebrew', sa.Text(), nullable=True),
+    sa.PrimaryKeyConstraint('id', 'year', 'provider_code')
+    )
+    op.create_index(op.f('ix_road_alignment_id'), 'road_alignment', ['id'], unique=False)
+    op.create_index(op.f('ix_road_alignment_provider_code'), 'road_alignment', ['provider_code'], unique=False)
+    op.create_index(op.f('ix_road_alignment_year'), 'road_alignment', ['year'], unique=False)
+    op.create_table('road_geometry',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('year', sa.Integer(), nullable=False),
+    sa.Column('provider_code', sa.Integer(), nullable=False),
+    sa.Column('road_geometry_hebrew', sa.Text(), nullable=True),
+    sa.PrimaryKeyConstraint('id', 'year', 'provider_code')
+    )
+    op.create_index(op.f('ix_road_geometry_id'), 'road_geometry', ['id'], unique=False)
+    op.create_index(op.f('ix_road_geometry_provider_code'), 'road_geometry', ['provider_code'], unique=False)
+    op.create_index(op.f('ix_road_geometry_year'), 'road_geometry', ['year'], unique=False)
+    op.create_table('vehicle_purpose',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('year', sa.Integer(), nullable=False),
+    sa.Column('provider_code', sa.Integer(), nullable=False),
+    sa.Column('vehicle_purpose_hebrew', sa.Text(), nullable=True),
+    sa.PrimaryKeyConstraint('id', 'year', 'provider_code')
+    )
+    op.create_index(op.f('ix_vehicle_purpose_id'), 'vehicle_purpose', ['id'], unique=False)
+    op.create_index(op.f('ix_vehicle_purpose_provider_code'), 'vehicle_purpose', ['provider_code'], unique=False)
+    op.create_index(op.f('ix_vehicle_purpose_year'), 'vehicle_purpose', ['year'], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f('ix_vehicle_purpose_year'), table_name='vehicle_purpose')
+    op.drop_index(op.f('ix_vehicle_purpose_provider_code'), table_name='vehicle_purpose')
+    op.drop_index(op.f('ix_vehicle_purpose_id'), table_name='vehicle_purpose')
+    op.drop_table('vehicle_purpose')
+    op.drop_index(op.f('ix_road_geometry_year'), table_name='road_geometry')
+    op.drop_index(op.f('ix_road_geometry_provider_code'), table_name='road_geometry')
+    op.drop_index(op.f('ix_road_geometry_id'), table_name='road_geometry')
+    op.drop_table('road_geometry')
+    op.drop_index(op.f('ix_road_alignment_year'), table_name='road_alignment')
+    op.drop_index(op.f('ix_road_alignment_provider_code'), table_name='road_alignment')
+    op.drop_index(op.f('ix_road_alignment_id'), table_name='road_alignment')
+    op.drop_table('road_alignment')
+    op.drop_index(op.f('ix_infrastructure_type_year'), table_name='infrastructure_type')
+    op.drop_index(op.f('ix_infrastructure_type_provider_code'), table_name='infrastructure_type')
+    op.drop_index(op.f('ix_infrastructure_type_id'), table_name='infrastructure_type')
+    op.drop_table('infrastructure_type')
+    op.drop_index(op.f('ix_entrance_exit_year'), table_name='entrance_exit')
+    op.drop_index(op.f('ix_entrance_exit_provider_code'), table_name='entrance_exit')
+    op.drop_index(op.f('ix_entrance_exit_id'), table_name='entrance_exit')
+    op.drop_table('entrance_exit')
+    # ### end Alembic commands ###

alembic/versions/39966aa5db4d_adding_junction_and_junction_arm_tables.py

@@ -0,0 +1,47 @@
+"""adding junction and junction_arm tables
+
+Revision ID: 39966aa5db4d
+Revises: c5d5e94fb059
+Create Date: 2026-02-10 16:45:35.963690
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '39966aa5db4d'
+down_revision = 'c5d5e94fb059'
+branch_labels = None
+depends_on = None
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    op.create_table(
+        'junction',
+        sa.Column('junction', sa.Integer(), nullable=False),
+        sa.Column('junction_hebrew', sa.String(length=100), nullable=True),
+        sa.Column('x', sa.Float(), nullable=True),
+        sa.Column('y', sa.Float(), nullable=True),
+        sa.PrimaryKeyConstraint('junction'),
+    )
+    op.create_table(
+        'junction_arm',
+        sa.Column('arm_symbol', sa.Integer(), nullable=False),
+        sa.Column('junction_symbol', sa.Integer(), nullable=True),
+        sa.Column('is_suburban', sa.Boolean(), nullable=True),
+        sa.Column('road_symbol', sa.Integer(), nullable=True),
+        sa.Column('km', sa.Float(), nullable=True),
+        sa.Column('yishuv_symbol', sa.Integer(), nullable=True),
+        sa.Column('street_symbol', sa.Integer(), nullable=True),
+        sa.Column('arm_name', sa.Text(), nullable=True),
+        sa.PrimaryKeyConstraint('arm_symbol'),
+    )
+    op.create_index(op.f('ix_junction_arm_arm_symbol'), 'junction_arm', ['arm_symbol'], unique=False)
+
+
+def downgrade():
+    op.drop_index(op.f('ix_junction_arm_arm_symbol'), table_name='junction_arm')
+    op.drop_table('junction_arm')
+    op.drop_table('junction')
+    # ### end Alembic commands ###