Merge branch 'main' into mgumowsk/ITEP-64780-weights-uploader

Author: mgumowsk

interactive_ai/migration_job/Dockerfile

@@ -9,11 +9,10 @@ ENV UV_LINK_MODE=copy
 ENV UV_PYTHON_DOWNLOADS=0
 
 # Copy the service dependencies
-WORKDIR /builder
 COPY --link --from=libs . libs
 COPY --link --from=data_migration . interactive_ai/data_migration
 
-WORKDIR /builder/interactive_ai/migration_job
+WORKDIR /interactive_ai/migration_job
 
 COPY --link --from=ghcr.io/astral-sh/uv:0.6.12 /uv /bin/uv
 
@@ -22,7 +21,6 @@ COPY --link migration_job/ .
 RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,source=uv.lock,target=uv.lock \
     --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
-    uv venv --relocatable && \
     uv sync --frozen --no-dev --no-editable
 
 FROM base AS runtime
@@ -34,14 +32,14 @@ RUN apt-get update && \
     useradd -l -u 10001 non-root && \
 	pip3 uninstall -y setuptools pip wheel && \
     rm -rf /root/.cache/pip
-   
-COPY --link --from=build --chown=10001 /builder/interactive_ai/migration_job /app/migration_job
 
-ARG VENV="/app/migration_job/.venv"
+COPY --link --from=build --chown=10001 /interactive_ai/migration_job /interactive_ai/migration_job
+
+ARG VENV="/interactive_ai/migration_job/.venv"
 ENV PATH="$VENV/bin:$PATH"
-ENV PYTHONPATH="/app"
+ENV PYTHONPATH="/interactive_ai"
 
 USER non-root
-WORKDIR /app
-COPY --link --chown=10001 entrypoint.sh .
+WORKDIR /interactive_ai/migration_job
+COPY --link --chown=10001 entrypoint.sh /interactive_ai/migration_job
 ENTRYPOINT [ "./entrypoint.sh"]

interactive_ai/services/auto_train/Dockerfile

@@ -7,7 +7,7 @@ ARG OTX_RELEASE_TAG=2.4.2
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-    git 
+    git
 
 RUN git clone --branch $OTX_RELEASE_TAG --single-branch https://github.com/open-edge-platform/training_extensions.git
 
@@ -18,11 +18,10 @@ ENV UV_LINK_MODE=copy
 ENV UV_PYTHON_DOWNLOADS=0
 
 # Copy the service dependencies
-WORKDIR /builder
 COPY --link --from=libs . libs
 COPY --link --from=iai_core . interactive_ai/libs/iai_core_py
 
-WORKDIR /builder/interactive_ai/services/auto_train
+WORKDIR /interactive_ai/services/auto_train
 
 COPY --link --from=ghcr.io/astral-sh/uv:0.6.12 /uv /bin/uv
 
@@ -31,7 +30,6 @@ COPY --link app/ .
 RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,source=uv.lock,target=uv.lock \
     --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
-    uv venv --relocatable && \
     uv sync --frozen --no-dev --no-editable
 
 FROM base AS runtime
@@ -41,13 +39,13 @@ RUN useradd -l -u 10001 non-root && \
     rm -rf /root/.cache/pip
 
 # Copy the application from the builder
-COPY --link --from=build --chown=10001 /builder/interactive_ai/services/auto_train /app
+COPY --link --from=build --chown=10001 /interactive_ai/services/auto_train /interactive_ai/services/auto_train
 COPY --link --from=build --chown=10001 /training_extensions/src/otx/tools/templates /model_templates
 
 # Place executables in the environment at the front of the path
-ENV PATH="/app/.venv/bin:$PATH"
-ENV PYTHONPATH="/app"
+ENV PATH="/interactive_ai/services/auto_train/.venv/bin:$PATH"
+ENV PYTHONPATH="/interactive_ai/services/auto_train"
 
 USER non-root
-WORKDIR /app
+WORKDIR /interactive_ai/services/auto_train
 CMD ["python", "main.py"]

interactive_ai/services/dataset_ie/Dockerfile

@@ -9,11 +9,10 @@ ENV UV_LINK_MODE=copy
 ENV UV_PYTHON_DOWNLOADS=0
 
 # Copy the service dependencies
-WORKDIR /builder
 COPY --link --from=libs . libs
 COPY --link --from=iai_core . interactive_ai/libs/iai_core_py
 
-WORKDIR /builder/interactive_ai/services/dataset_ie
+WORKDIR /interactive_ai/services/dataset_ie
 
 COPY --link --from=ghcr.io/astral-sh/uv:0.6.12 /uv /bin/uv
 
@@ -22,7 +21,6 @@ COPY --link app/ .
 RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,source=uv.lock,target=uv.lock \
     --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
-    uv venv --relocatable && \
     uv sync --frozen --no-dev --no-editable
 
 FROM base AS runtime
@@ -32,12 +30,12 @@ RUN useradd -l -u 10001 non-root && \
     rm -rf /root/.cache/pip
 
 # Copy the application from the builder
-COPY --link --from=build --chown=10001 /builder/interactive_ai/services/dataset_ie /app
+COPY --link --from=build --chown=10001 /interactive_ai/services/dataset_ie /interactive_ai/services/dataset_ie
 
 # Place executables in the environment at the front of the path
-ENV PATH="/app/.venv/bin:$PATH"
-ENV PYTHONPATH="/app"
+ENV PATH="/interactive_ai/services/dataset_ie/.venv/bin:$PATH"
+ENV PYTHONPATH="/interactive_ai/services/dataset_ie"
 
 USER non-root
-WORKDIR /app/communication/endpoints
+WORKDIR /interactive_ai/services/dataset_ie/communication/endpoints
 CMD ["python", "main.py"]

interactive_ai/services/director/Dockerfile

@@ -7,7 +7,7 @@ ARG OTX_RELEASE_TAG=2.4.2
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-    git 
+    git
 
 RUN git clone --branch $OTX_RELEASE_TAG --single-branch https://github.com/open-edge-platform/training_extensions.git
 
@@ -18,21 +18,19 @@ ENV UV_LINK_MODE=copy
 ENV UV_PYTHON_DOWNLOADS=0
 
 # Copy the service dependencies
-WORKDIR /builder
 COPY --link --from=libs . libs
 COPY --link --from=iai_core . interactive_ai/libs/iai_core_py
 COPY --link --from=supported_models . interactive_ai/supported_models
 
-WORKDIR /builder/interactive_ai/services/director
+WORKDIR /interactive_ai/services/director
 
 COPY --link --from=ghcr.io/astral-sh/uv:0.6.12 /uv /bin/uv
 
-COPY --link app/ .
+COPY --link app/ app
 
 RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,source=uv.lock,target=uv.lock \
     --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
-    uv venv --relocatable && \
     uv sync --frozen --no-dev --no-editable
 
 FROM base AS runtime
@@ -42,14 +40,14 @@ RUN useradd -l -u 10001 non-root && \
     rm -rf /root/.cache/pip
 
 # Copy the application from the builder
-COPY --link --from=build --chown=10001 /builder/interactive_ai/services/director /app
+COPY --link --from=build --chown=10001 /interactive_ai/services/director /interactive_ai/services/director
 COPY --link --from=build --chown=10001 /training_extensions/src/otx/tools/templates /model_templates
-COPY --link --from=schemas . /api
+COPY --link --from=schemas . /interactive_ai/services/api
 
 # Place executables in the environment at the front of the path
-ENV PATH="/app/.venv/bin:$PATH"
-ENV PYTHONPATH="/app"
+ENV PATH="/interactive_ai/services/director/.venv/bin:$PATH"
+ENV PYTHONPATH="/interactive_ai/services/director:/interactive_ai/services/director/app"
 
 USER non-root
-WORKDIR /app/communication
+WORKDIR /interactive_ai/services/director/app/communication
 CMD ["python", "main.py"]

interactive_ai/services/jobs/Dockerfile

@@ -9,11 +9,10 @@ ENV UV_LINK_MODE=copy
 ENV UV_PYTHON_DOWNLOADS=0
 
 # Copy the service dependencies
-WORKDIR /builder
 COPY --link --from=libs . libs
 COPY --link --from=iai_core . interactive_ai/libs/iai_core_py
 
-WORKDIR /builder/interactive_ai/services/jobs
+WORKDIR /interactive_ai/services/jobs
 
 COPY --link --from=ghcr.io/astral-sh/uv:0.6.12 /uv /bin/uv
 
@@ -22,7 +21,6 @@ COPY --link app/ .
 RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,source=uv.lock,target=uv.lock \
     --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
-    uv venv --relocatable && \
     uv sync --frozen --no-dev --no-editable
 
 FROM base AS runtime
@@ -32,12 +30,12 @@ RUN useradd -l -u 10001 non-root && \
     rm -rf /root/.cache/pip
 
 # Copy the application from the builder
-COPY --link --from=build --chown=10001 /builder/interactive_ai/services/jobs /app
+COPY --link --from=build --chown=10001 /interactive_ai/services/jobs /interactive_ai/services/jobs
 
 # Place executables in the environment at the front of the path
-ENV PATH="/app/.venv/bin:$PATH"
-ENV PYTHONPATH="/app"
+ENV PATH="/interactive_ai/services/jobs/.venv/bin:$PATH"
+ENV PYTHONPATH="/interactive_ai/services/jobs"
 
 USER non-root
-WORKDIR /app
+WORKDIR /interactive_ai/services/jobs
 CMD ["python", "microservice/rest/main.py"]

interactive_ai/services/jobs/chart/Chart.yaml

@@ -1,6 +1,6 @@
-name: jobs-ms
+name: jobs
 apiVersion: v2
-description: platform chart
+description: jobs microservice / scheduler / policy service
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
@@ -11,14 +11,3 @@ version: 0.0.1
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: v0.0.1
-
-dependencies:
-  - name: jobs-ms
-    version: 0.0.8
-    condition: enabled.jobs-ms
-  - name: jobs-scheduler
-    version: 0.0.10
-    condition: enabled.jobs-scheduler
-  - name: jobs-scheduling-policy
-    version: 0.0.3
-    condition: enabled.jobs-scheduling-policy