From 406597275b9768432d50770d1c0f6cd1f5da7725 Mon Sep 17 00:00:00 2001 From: Kristin Ottofy Date: Mon, 28 Oct 2024 19:35:01 +0000 Subject: [PATCH 01/16] rename src folders --- .azure-pipelines/docker_taxi_cd_pipeline.yml | 2 +- .azure-pipelines/docker_taxi_ci_pipeline.yml | 2 +- .azure-pipelines/london_taxi_cd_pipeline.yml | 2 +- .azure-pipelines/london_taxi_ci_pipeline.yml | 2 +- .azure-pipelines/nyc_taxi_cd_pipeline.yml | 2 +- .azure-pipelines/nyc_taxi_ci_pipeline.yml | 2 +- .github/workflows/docker_taxi_cd_pipeline.yml | 2 +- .github/workflows/docker_taxi_ci_pipeline.yml | 2 +- .github/workflows/london_taxi_cd_pipeline.yml | 2 +- .github/workflows/london_taxi_ci_pipeline.yml | 2 +- .github/workflows/nyc_taxi_cd_pipeline.yml | 2 +- .github/workflows/nyc_taxi_ci_pipeline.yml | 2 +- README.md | 2 +- docs/design-decisions/ModelPromotion.md | 2 +- docs/how-to/DSScriptInputsAndOutputs.md | 2 +- mlops/docker_taxi/components/predict.yml | 2 +- mlops/docker_taxi/components/prep.yml | 2 +- mlops/docker_taxi/components/register.yml | 2 +- mlops/docker_taxi/components/score.yml | 2 +- mlops/docker_taxi/components/train.yml | 2 +- mlops/docker_taxi/components/transform.yml | 2 +- src/{docker_taxi_src => docker_taxi}/__init__.py | 0 src/{docker_taxi_src => docker_taxi}/predict/__init__.py | 0 src/{docker_taxi_src => docker_taxi}/predict/predict.py | 0 src/{docker_taxi_src => docker_taxi}/prep/__init__.py | 0 src/{docker_taxi_src => docker_taxi}/prep/prep.py | 0 src/{docker_taxi_src => docker_taxi}/register/__init__.py | 0 src/{docker_taxi_src => docker_taxi}/register/register.py | 0 src/{docker_taxi_src => docker_taxi}/score/__init__.py | 0 src/{docker_taxi_src => docker_taxi}/score/score.py | 0 src/{docker_taxi_src => docker_taxi}/train/__init__.py | 0 src/{docker_taxi_src => docker_taxi}/train/train.py | 0 src/{docker_taxi_src => docker_taxi}/transform/__init__.py | 0 src/{docker_taxi_src => docker_taxi}/transform/transform.py | 0 src/{london_src => london_taxi}/__init__.py | 0 src/{london_src => london_taxi}/predict/__init__.py | 0 src/{london_src => london_taxi}/predict/predict.py | 0 src/{london_src => london_taxi}/prep/__init__.py | 0 src/{london_src => london_taxi}/prep/prep.py | 0 src/{london_src => london_taxi}/register/__init__.py | 0 src/{london_src => london_taxi}/register/register.py | 0 src/{london_src => london_taxi}/score/__init__.py | 0 src/{london_src => london_taxi}/score/score.py | 0 src/{london_src => london_taxi}/train/__init__.py | 0 src/{london_src => london_taxi}/train/train.py | 0 src/{london_src => london_taxi}/transform/__init__.py | 0 src/{london_src => london_taxi}/transform/transform.py | 0 src/{nyc_src => nyc_taxi}/__init__.py | 0 src/{nyc_src => nyc_taxi}/predict/__init__.py | 0 src/{nyc_src => nyc_taxi}/predict/predict.py | 0 src/{nyc_src => nyc_taxi}/prep/__init__.py | 0 src/{nyc_src => nyc_taxi}/prep/prep.py | 0 src/{nyc_src => nyc_taxi}/register/__init__.py | 0 src/{nyc_src => nyc_taxi}/register/register.py | 0 src/{nyc_src => nyc_taxi}/score/__init__.py | 0 src/{nyc_src => nyc_taxi}/score/score.py | 0 src/{nyc_src => nyc_taxi}/train/__init__.py | 0 src/{nyc_src => nyc_taxi}/train/train.py | 0 src/{nyc_src => nyc_taxi}/transform/__init__.py | 0 src/{nyc_src => nyc_taxi}/transform/transform.py | 0 60 files changed, 21 insertions(+), 21 deletions(-) rename src/{docker_taxi_src => docker_taxi}/__init__.py (100%) rename src/{docker_taxi_src => docker_taxi}/predict/__init__.py (100%) rename src/{docker_taxi_src => docker_taxi}/predict/predict.py (100%) rename src/{docker_taxi_src => docker_taxi}/prep/__init__.py (100%) rename src/{docker_taxi_src => docker_taxi}/prep/prep.py (100%) rename src/{docker_taxi_src => docker_taxi}/register/__init__.py (100%) rename src/{docker_taxi_src => docker_taxi}/register/register.py (100%) rename src/{docker_taxi_src => docker_taxi}/score/__init__.py (100%) rename src/{docker_taxi_src => docker_taxi}/score/score.py (100%) rename src/{docker_taxi_src => docker_taxi}/train/__init__.py (100%) rename src/{docker_taxi_src => docker_taxi}/train/train.py (100%) rename src/{docker_taxi_src => docker_taxi}/transform/__init__.py (100%) rename src/{docker_taxi_src => docker_taxi}/transform/transform.py (100%) rename src/{london_src => london_taxi}/__init__.py (100%) rename src/{london_src => london_taxi}/predict/__init__.py (100%) rename src/{london_src => london_taxi}/predict/predict.py (100%) rename src/{london_src => london_taxi}/prep/__init__.py (100%) rename src/{london_src => london_taxi}/prep/prep.py (100%) rename src/{london_src => london_taxi}/register/__init__.py (100%) rename src/{london_src => london_taxi}/register/register.py (100%) rename src/{london_src => london_taxi}/score/__init__.py (100%) rename src/{london_src => london_taxi}/score/score.py (100%) rename src/{london_src => london_taxi}/train/__init__.py (100%) rename src/{london_src => london_taxi}/train/train.py (100%) rename src/{london_src => london_taxi}/transform/__init__.py (100%) rename src/{london_src => london_taxi}/transform/transform.py (100%) rename src/{nyc_src => nyc_taxi}/__init__.py (100%) rename src/{nyc_src => nyc_taxi}/predict/__init__.py (100%) rename src/{nyc_src => nyc_taxi}/predict/predict.py (100%) rename src/{nyc_src => nyc_taxi}/prep/__init__.py (100%) rename src/{nyc_src => nyc_taxi}/prep/prep.py (100%) rename src/{nyc_src => nyc_taxi}/register/__init__.py (100%) rename src/{nyc_src => nyc_taxi}/register/register.py (100%) rename src/{nyc_src => nyc_taxi}/score/__init__.py (100%) rename src/{nyc_src => nyc_taxi}/score/score.py (100%) rename src/{nyc_src => nyc_taxi}/train/__init__.py (100%) rename src/{nyc_src => nyc_taxi}/train/train.py (100%) rename src/{nyc_src => nyc_taxi}/transform/__init__.py (100%) rename src/{nyc_src => nyc_taxi}/transform/transform.py (100%) diff --git a/.azure-pipelines/docker_taxi_cd_pipeline.yml b/.azure-pipelines/docker_taxi_cd_pipeline.yml index f76567fe..bffeeb5c 100644 --- a/.azure-pipelines/docker_taxi_cd_pipeline.yml +++ b/.azure-pipelines/docker_taxi_cd_pipeline.yml @@ -8,7 +8,7 @@ trigger: - .azure-pipelines/* - mlops/common/* - mlops/docker_taxi/* - - src/docker_taxi_src/* + - src/docker_taxi/* - model/docker_taxi/* - src/shared/* diff --git a/.azure-pipelines/docker_taxi_ci_pipeline.yml b/.azure-pipelines/docker_taxi_ci_pipeline.yml index 3954c341..38975cec 100644 --- a/.azure-pipelines/docker_taxi_ci_pipeline.yml +++ b/.azure-pipelines/docker_taxi_ci_pipeline.yml @@ -8,7 +8,7 @@ pr: - .azure-pipelines/* - mlops/common/* - mlops/docker_taxi/* - - src/docker_taxi_src/* + - src/docker_taxi/* - model/docker_taxi/* - src/shared/* pool: diff --git a/.azure-pipelines/london_taxi_cd_pipeline.yml b/.azure-pipelines/london_taxi_cd_pipeline.yml index f855e4e7..7295053f 100644 --- a/.azure-pipelines/london_taxi_cd_pipeline.yml +++ b/.azure-pipelines/london_taxi_cd_pipeline.yml @@ -8,7 +8,7 @@ trigger: - .azure-pipelines/* - mlops/common/* - mlops/london_taxi/* - - src/london_src/* + - src/london_taxi/* - model/london_taxi/* - src/shared/* diff --git a/.azure-pipelines/london_taxi_ci_pipeline.yml b/.azure-pipelines/london_taxi_ci_pipeline.yml index a5bb034e..e9532168 100644 --- a/.azure-pipelines/london_taxi_ci_pipeline.yml +++ b/.azure-pipelines/london_taxi_ci_pipeline.yml @@ -8,7 +8,7 @@ pr: - .azure-pipelines/* - mlops/common/* - mlops/london_taxi/* - - src/london_src/* + - src/london_taxi/* - model/london_taxi/* - src/shared/* diff --git a/.azure-pipelines/nyc_taxi_cd_pipeline.yml b/.azure-pipelines/nyc_taxi_cd_pipeline.yml index a961ba7e..88b49bca 100644 --- a/.azure-pipelines/nyc_taxi_cd_pipeline.yml +++ b/.azure-pipelines/nyc_taxi_cd_pipeline.yml @@ -8,7 +8,7 @@ trigger: - .azure-pipelines/* - mlops/common/* - mlops/nyc_taxi/* - - src/nyc_src/* + - src/nyc_taxi/* - model/nyc_taxi/* - src/shared/* diff --git a/.azure-pipelines/nyc_taxi_ci_pipeline.yml b/.azure-pipelines/nyc_taxi_ci_pipeline.yml index 70afc110..6ccc5107 100644 --- a/.azure-pipelines/nyc_taxi_ci_pipeline.yml +++ b/.azure-pipelines/nyc_taxi_ci_pipeline.yml @@ -8,7 +8,7 @@ pr: - .azure-pipelines/* - mlops/common/* - mlops/nyc_taxi/* - - src/nyc_src/* + - src/nyc_taxi/* - model/nyc_taxi/* - src/shared/* pool: diff --git a/.github/workflows/docker_taxi_cd_pipeline.yml b/.github/workflows/docker_taxi_cd_pipeline.yml index ee2b0671..1d53daf5 100644 --- a/.github/workflows/docker_taxi_cd_pipeline.yml +++ b/.github/workflows/docker_taxi_cd_pipeline.yml @@ -8,7 +8,7 @@ on: - mlops/common/** - mlops/docker_taxi/** - model/docker_taxi/** - - src/docker_taxi_src/** + - src/docker_taxi/** - test/docker_taxi/** workflow_call: inputs: diff --git a/.github/workflows/docker_taxi_ci_pipeline.yml b/.github/workflows/docker_taxi_ci_pipeline.yml index fd6a98d4..cfc363b6 100644 --- a/.github/workflows/docker_taxi_ci_pipeline.yml +++ b/.github/workflows/docker_taxi_ci_pipeline.yml @@ -9,7 +9,7 @@ on: - 'mlops/common/**' - 'mlops/docker_taxi/**' - 'model/docker_taxi/**' - - 'src/docker_taxi_src/**' + - 'src/docker_taxi/**' - 'test/docker_taxi/**' workflow_call: inputs: diff --git a/.github/workflows/london_taxi_cd_pipeline.yml b/.github/workflows/london_taxi_cd_pipeline.yml index d49b726d..5298f6db 100644 --- a/.github/workflows/london_taxi_cd_pipeline.yml +++ b/.github/workflows/london_taxi_cd_pipeline.yml @@ -7,7 +7,7 @@ on: - mlops/common/** - mlops/london_taxi/** - model/london_taxi/** - - src/london_src/** + - src/london_taxi/** - test/london_taxi/** workflow_call: inputs: diff --git a/.github/workflows/london_taxi_ci_pipeline.yml b/.github/workflows/london_taxi_ci_pipeline.yml index 816f0546..87aa8e43 100644 --- a/.github/workflows/london_taxi_ci_pipeline.yml +++ b/.github/workflows/london_taxi_ci_pipeline.yml @@ -9,7 +9,7 @@ on: - 'mlops/common/**' - 'mlops/london_taxi/**' - 'model/london_taxi/**' - - 'src/london_src/**' + - 'src/london_taxi/**' - 'test/london_taxi/**' workflow_call: inputs: diff --git a/.github/workflows/nyc_taxi_cd_pipeline.yml b/.github/workflows/nyc_taxi_cd_pipeline.yml index 35985ce3..515b4879 100644 --- a/.github/workflows/nyc_taxi_cd_pipeline.yml +++ b/.github/workflows/nyc_taxi_cd_pipeline.yml @@ -8,7 +8,7 @@ on: - mlops/common/** - mlops/nyc_taxi/** - model/nyc_taxi/** - - src/nyc_src/** + - src/nyc_taxi/** - test/nyc_taxi/** workflow_call: inputs: diff --git a/.github/workflows/nyc_taxi_ci_pipeline.yml b/.github/workflows/nyc_taxi_ci_pipeline.yml index f666a622..16700c03 100644 --- a/.github/workflows/nyc_taxi_ci_pipeline.yml +++ b/.github/workflows/nyc_taxi_ci_pipeline.yml @@ -9,7 +9,7 @@ on: - 'mlops/common/**' - 'mlops/nyc_taxi/**' - 'model/nyc_taxi/**' - - 'src/nyc_src/**' + - 'src/nyc_taxi/**' - 'test/nyc_taxi/**' workflow_call: inputs: diff --git a/README.md b/README.md index 4c0d7669..63eba6bd 100644 --- a/README.md +++ b/README.md @@ -186,7 +186,7 @@ changed. By defining these paths, we ensure that only the necessary pipelines ar tests, and speeding up the overall CI/CD process. For example: - Changes to the `src/` directory trigger the build and validation pipeline. -- Changes to the `src/london_src/*` directory trigger the london_taxi pipelines and not the nyc_taxi or docker_taxi pipelines. +- Changes to the `src/london_taxi/*` directory trigger the london_taxi pipelines and not the nyc_taxi or docker_taxi pipelines. ### Notes diff --git a/docs/design-decisions/ModelPromotion.md b/docs/design-decisions/ModelPromotion.md index 966eab0b..dce28a73 100644 --- a/docs/design-decisions/ModelPromotion.md +++ b/docs/design-decisions/ModelPromotion.md @@ -57,7 +57,7 @@ on: - 'mlops/common/**' - 'mlops/nyc_taxi/**' - 'model/nyc_taxi/**' - - 'src/nyc_src/**' + - 'src/nyc_taxi/**' - 'test/nyc_taxi/**' paths-ignore: - '.experimentation/**' diff --git a/docs/how-to/DSScriptInputsAndOutputs.md b/docs/how-to/DSScriptInputsAndOutputs.md index 59ecf1ad..4c0491f2 100644 --- a/docs/how-to/DSScriptInputsAndOutputs.md +++ b/docs/how-to/DSScriptInputsAndOutputs.md @@ -2,7 +2,7 @@ ## Context and Scope -The GitHub workflows create Azure Machine Learning (AML) jobs which in turn run the scripts defined under this repo's src directory. For example, [src/nyc_src/train/train.py](/src/nyc_src/train/train.py). Each of these scripts requires a series of inputs and produces outputs which can be used in downstream scripts. Understanding how inputs and outputs to these scripts function is critical when integrating promoted models. +The GitHub workflows create Azure Machine Learning (AML) jobs which in turn run the scripts defined under this repo's src directory. For example, [src/nyc_taxi/train/train.py](/src/nyc_taxi/train/train.py). Each of these scripts requires a series of inputs and produces outputs which can be used in downstream scripts. Understanding how inputs and outputs to these scripts function is critical when integrating promoted models. ## Script Inputs and Outputs diff --git a/mlops/docker_taxi/components/predict.yml b/mlops/docker_taxi/components/predict.yml index 53983bec..853de759 100644 --- a/mlops/docker_taxi/components/predict.yml +++ b/mlops/docker_taxi/components/predict.yml @@ -14,7 +14,7 @@ outputs: environment: azureml:AzureML-sklearn-1.1-ubuntu20.04-py38-cpu@latest code: ./../../../ command: >- - python -m src.docker_taxi_src.predict.predict + python -m src.docker_taxi.predict.predict --model_input ${{inputs.model_input}} --test_data ${{inputs.test_data}} --predictions ${{outputs.predictions}} diff --git a/mlops/docker_taxi/components/prep.yml b/mlops/docker_taxi/components/prep.yml index 9a92f2eb..d6ce7010 100644 --- a/mlops/docker_taxi/components/prep.yml +++ b/mlops/docker_taxi/components/prep.yml @@ -12,7 +12,7 @@ outputs: code: ./../../../ environment: azureml:AzureML-sklearn-1.1-ubuntu20.04-py38-cpu@latest command: >- - python -m src.docker_taxi_src.prep.prep + python -m src.docker_taxi.prep.prep --raw_data ${{inputs.raw_data}} --prep_data ${{outputs.prep_data}} diff --git a/mlops/docker_taxi/components/register.yml b/mlops/docker_taxi/components/register.yml index 656fa8aa..ab65529c 100644 --- a/mlops/docker_taxi/components/register.yml +++ b/mlops/docker_taxi/components/register.yml @@ -15,7 +15,7 @@ inputs: code: ./../../../ environment: azureml:AzureML-sklearn-1.1-ubuntu20.04-py38-cpu@latest command: >- - python -m src.docker_taxi_src.register.register + python -m src.docker_taxi.register.register --model_metadata ${{inputs.model_metadata}} --model_name ${{inputs.model_name}} --score_report ${{inputs.score_report}} diff --git a/mlops/docker_taxi/components/score.yml b/mlops/docker_taxi/components/score.yml index e96404bb..2ba03531 100644 --- a/mlops/docker_taxi/components/score.yml +++ b/mlops/docker_taxi/components/score.yml @@ -14,7 +14,7 @@ outputs: environment: azureml:AzureML-sklearn-1.1-ubuntu20.04-py38-cpu@latest code: ./../../../ command: >- - python -m src.docker_taxi_src.score.score + python -m src.docker_taxi.score.score --predictions ${{inputs.predictions}} --model ${{inputs.model}} --score_report ${{outputs.score_report}} diff --git a/mlops/docker_taxi/components/train.yml b/mlops/docker_taxi/components/train.yml index 6dd28106..a5e59f63 100644 --- a/mlops/docker_taxi/components/train.yml +++ b/mlops/docker_taxi/components/train.yml @@ -16,7 +16,7 @@ outputs: code: ./../../../ environment: azureml:AzureML-sklearn-1.1-ubuntu20.04-py38-cpu@latest command: >- - python -m src.docker_taxi_src.train.train + python -m src.docker_taxi.train.train --training_data ${{inputs.training_data}} --test_data ${{outputs.test_data}} --model_output ${{outputs.model_output}} diff --git a/mlops/docker_taxi/components/transform.yml b/mlops/docker_taxi/components/transform.yml index 0432fe78..64773206 100644 --- a/mlops/docker_taxi/components/transform.yml +++ b/mlops/docker_taxi/components/transform.yml @@ -12,7 +12,7 @@ outputs: code: ./../../../ environment: azureml:AzureML-sklearn-1.1-ubuntu20.04-py38-cpu@latest command: >- - python -m src.docker_taxi_src.transform.transform + python -m src.docker_taxi.transform.transform --clean_data ${{inputs.clean_data}} --transformed_data ${{outputs.transformed_data}} diff --git a/src/docker_taxi_src/__init__.py b/src/docker_taxi/__init__.py similarity index 100% rename from src/docker_taxi_src/__init__.py rename to src/docker_taxi/__init__.py diff --git a/src/docker_taxi_src/predict/__init__.py b/src/docker_taxi/predict/__init__.py similarity index 100% rename from src/docker_taxi_src/predict/__init__.py rename to src/docker_taxi/predict/__init__.py diff --git a/src/docker_taxi_src/predict/predict.py b/src/docker_taxi/predict/predict.py similarity index 100% rename from src/docker_taxi_src/predict/predict.py rename to src/docker_taxi/predict/predict.py diff --git a/src/docker_taxi_src/prep/__init__.py b/src/docker_taxi/prep/__init__.py similarity index 100% rename from src/docker_taxi_src/prep/__init__.py rename to src/docker_taxi/prep/__init__.py diff --git a/src/docker_taxi_src/prep/prep.py b/src/docker_taxi/prep/prep.py similarity index 100% rename from src/docker_taxi_src/prep/prep.py rename to src/docker_taxi/prep/prep.py diff --git a/src/docker_taxi_src/register/__init__.py b/src/docker_taxi/register/__init__.py similarity index 100% rename from src/docker_taxi_src/register/__init__.py rename to src/docker_taxi/register/__init__.py diff --git a/src/docker_taxi_src/register/register.py b/src/docker_taxi/register/register.py similarity index 100% rename from src/docker_taxi_src/register/register.py rename to src/docker_taxi/register/register.py diff --git a/src/docker_taxi_src/score/__init__.py b/src/docker_taxi/score/__init__.py similarity index 100% rename from src/docker_taxi_src/score/__init__.py rename to src/docker_taxi/score/__init__.py diff --git a/src/docker_taxi_src/score/score.py b/src/docker_taxi/score/score.py similarity index 100% rename from src/docker_taxi_src/score/score.py rename to src/docker_taxi/score/score.py diff --git a/src/docker_taxi_src/train/__init__.py b/src/docker_taxi/train/__init__.py similarity index 100% rename from src/docker_taxi_src/train/__init__.py rename to src/docker_taxi/train/__init__.py diff --git a/src/docker_taxi_src/train/train.py b/src/docker_taxi/train/train.py similarity index 100% rename from src/docker_taxi_src/train/train.py rename to src/docker_taxi/train/train.py diff --git a/src/docker_taxi_src/transform/__init__.py b/src/docker_taxi/transform/__init__.py similarity index 100% rename from src/docker_taxi_src/transform/__init__.py rename to src/docker_taxi/transform/__init__.py diff --git a/src/docker_taxi_src/transform/transform.py b/src/docker_taxi/transform/transform.py similarity index 100% rename from src/docker_taxi_src/transform/transform.py rename to src/docker_taxi/transform/transform.py diff --git a/src/london_src/__init__.py b/src/london_taxi/__init__.py similarity index 100% rename from src/london_src/__init__.py rename to src/london_taxi/__init__.py diff --git a/src/london_src/predict/__init__.py b/src/london_taxi/predict/__init__.py similarity index 100% rename from src/london_src/predict/__init__.py rename to src/london_taxi/predict/__init__.py diff --git a/src/london_src/predict/predict.py b/src/london_taxi/predict/predict.py similarity index 100% rename from src/london_src/predict/predict.py rename to src/london_taxi/predict/predict.py diff --git a/src/london_src/prep/__init__.py b/src/london_taxi/prep/__init__.py similarity index 100% rename from src/london_src/prep/__init__.py rename to src/london_taxi/prep/__init__.py diff --git a/src/london_src/prep/prep.py b/src/london_taxi/prep/prep.py similarity index 100% rename from src/london_src/prep/prep.py rename to src/london_taxi/prep/prep.py diff --git a/src/london_src/register/__init__.py b/src/london_taxi/register/__init__.py similarity index 100% rename from src/london_src/register/__init__.py rename to src/london_taxi/register/__init__.py diff --git a/src/london_src/register/register.py b/src/london_taxi/register/register.py similarity index 100% rename from src/london_src/register/register.py rename to src/london_taxi/register/register.py diff --git a/src/london_src/score/__init__.py b/src/london_taxi/score/__init__.py similarity index 100% rename from src/london_src/score/__init__.py rename to src/london_taxi/score/__init__.py diff --git a/src/london_src/score/score.py b/src/london_taxi/score/score.py similarity index 100% rename from src/london_src/score/score.py rename to src/london_taxi/score/score.py diff --git a/src/london_src/train/__init__.py b/src/london_taxi/train/__init__.py similarity index 100% rename from src/london_src/train/__init__.py rename to src/london_taxi/train/__init__.py diff --git a/src/london_src/train/train.py b/src/london_taxi/train/train.py similarity index 100% rename from src/london_src/train/train.py rename to src/london_taxi/train/train.py diff --git a/src/london_src/transform/__init__.py b/src/london_taxi/transform/__init__.py similarity index 100% rename from src/london_src/transform/__init__.py rename to src/london_taxi/transform/__init__.py diff --git a/src/london_src/transform/transform.py b/src/london_taxi/transform/transform.py similarity index 100% rename from src/london_src/transform/transform.py rename to src/london_taxi/transform/transform.py diff --git a/src/nyc_src/__init__.py b/src/nyc_taxi/__init__.py similarity index 100% rename from src/nyc_src/__init__.py rename to src/nyc_taxi/__init__.py diff --git a/src/nyc_src/predict/__init__.py b/src/nyc_taxi/predict/__init__.py similarity index 100% rename from src/nyc_src/predict/__init__.py rename to src/nyc_taxi/predict/__init__.py diff --git a/src/nyc_src/predict/predict.py b/src/nyc_taxi/predict/predict.py similarity index 100% rename from src/nyc_src/predict/predict.py rename to src/nyc_taxi/predict/predict.py diff --git a/src/nyc_src/prep/__init__.py b/src/nyc_taxi/prep/__init__.py similarity index 100% rename from src/nyc_src/prep/__init__.py rename to src/nyc_taxi/prep/__init__.py diff --git a/src/nyc_src/prep/prep.py b/src/nyc_taxi/prep/prep.py similarity index 100% rename from src/nyc_src/prep/prep.py rename to src/nyc_taxi/prep/prep.py diff --git a/src/nyc_src/register/__init__.py b/src/nyc_taxi/register/__init__.py similarity index 100% rename from src/nyc_src/register/__init__.py rename to src/nyc_taxi/register/__init__.py diff --git a/src/nyc_src/register/register.py b/src/nyc_taxi/register/register.py similarity index 100% rename from src/nyc_src/register/register.py rename to src/nyc_taxi/register/register.py diff --git a/src/nyc_src/score/__init__.py b/src/nyc_taxi/score/__init__.py similarity index 100% rename from src/nyc_src/score/__init__.py rename to src/nyc_taxi/score/__init__.py diff --git a/src/nyc_src/score/score.py b/src/nyc_taxi/score/score.py similarity index 100% rename from src/nyc_src/score/score.py rename to src/nyc_taxi/score/score.py diff --git a/src/nyc_src/train/__init__.py b/src/nyc_taxi/train/__init__.py similarity index 100% rename from src/nyc_src/train/__init__.py rename to src/nyc_taxi/train/__init__.py diff --git a/src/nyc_src/train/train.py b/src/nyc_taxi/train/train.py similarity index 100% rename from src/nyc_src/train/train.py rename to src/nyc_taxi/train/train.py diff --git a/src/nyc_src/transform/__init__.py b/src/nyc_taxi/transform/__init__.py similarity index 100% rename from src/nyc_src/transform/__init__.py rename to src/nyc_taxi/transform/__init__.py diff --git a/src/nyc_src/transform/transform.py b/src/nyc_taxi/transform/transform.py similarity index 100% rename from src/nyc_src/transform/transform.py rename to src/nyc_taxi/transform/transform.py From d6d6c8536d32c6e8f057c659d9e8573b632a168b Mon Sep 17 00:00:00 2001 From: Kristin Ottofy Date: Mon, 28 Oct 2024 19:42:14 +0000 Subject: [PATCH 02/16] temporarily test cd workflow --- .azure-pipelines/docker_taxi_cd_pipeline.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/docker_taxi_cd_pipeline.yml b/.azure-pipelines/docker_taxi_cd_pipeline.yml index bffeeb5c..e1ec9a6a 100644 --- a/.azure-pipelines/docker_taxi_cd_pipeline.yml +++ b/.azure-pipelines/docker_taxi_cd_pipeline.yml @@ -1,5 +1,12 @@ -pr: none -trigger: +# pr: none +# trigger: +# branches: +# include: +# - main +# paths: +# include: +trigger: none +pr: branches: include: - main From fddc9c9dc7d9270abfa8695f6818e589aa7d53c7 Mon Sep 17 00:00:00 2001 From: Kristin Ottofy Date: Mon, 28 Oct 2024 19:47:00 +0000 Subject: [PATCH 03/16] restore azure pipeline --- .azure-pipelines/docker_taxi_cd_pipeline.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.azure-pipelines/docker_taxi_cd_pipeline.yml b/.azure-pipelines/docker_taxi_cd_pipeline.yml index e1ec9a6a..bffeeb5c 100644 --- a/.azure-pipelines/docker_taxi_cd_pipeline.yml +++ b/.azure-pipelines/docker_taxi_cd_pipeline.yml @@ -1,12 +1,5 @@ -# pr: none -# trigger: -# branches: -# include: -# - main -# paths: -# include: -trigger: none -pr: +pr: none +trigger: branches: include: - main From 80cc32c0ee22f9609290cd86ce4a773a9537a3d7 Mon Sep 17 00:00:00 2001 From: Kristin Ottofy Date: Mon, 28 Oct 2024 19:47:39 +0000 Subject: [PATCH 04/16] temporarily test workflow --- .github/workflows/docker_taxi_cd_pipeline.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker_taxi_cd_pipeline.yml b/.github/workflows/docker_taxi_cd_pipeline.yml index 1d53daf5..b28b9cff 100644 --- a/.github/workflows/docker_taxi_cd_pipeline.yml +++ b/.github/workflows/docker_taxi_cd_pipeline.yml @@ -1,7 +1,11 @@ name: Custom Object Detection CD Workflow +# on: +# push: +# branches: +# - main on: - push: + pull_request: branches: - main paths: From 593339fdd76be0f47d2d152e350bf1120b7f0525 Mon Sep 17 00:00:00 2001 From: Kristin Ottofy Date: Mon, 28 Oct 2024 19:53:53 +0000 Subject: [PATCH 05/16] fix file paths --- docs/how-to/DSScriptInputsAndOutputs.md | 2 +- mlops/london_taxi/components/predict.yml | 2 +- mlops/london_taxi/components/prep.yml | 2 +- mlops/london_taxi/components/register.yml | 2 +- mlops/london_taxi/components/score.yml | 2 +- mlops/london_taxi/components/train.yml | 2 +- mlops/london_taxi/components/transform.yml | 2 +- mlops/nyc_taxi/components/predict.yml | 2 +- mlops/nyc_taxi/components/prep.yml | 2 +- mlops/nyc_taxi/components/register.yml | 2 +- mlops/nyc_taxi/components/score.yml | 2 +- mlops/nyc_taxi/components/train.yml | 2 +- mlops/nyc_taxi/components/transform.yml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/how-to/DSScriptInputsAndOutputs.md b/docs/how-to/DSScriptInputsAndOutputs.md index 4c0491f2..344379c5 100644 --- a/docs/how-to/DSScriptInputsAndOutputs.md +++ b/docs/how-to/DSScriptInputsAndOutputs.md @@ -38,7 +38,7 @@ The resulting command looks like: ```yaml ... command: >- - python -m src.nyc_src.train.train + python -m src.nyc_taxi.train.train --train_path ${{inputs.train_path}} --val_path ${{inputs.val_path}} --meta_path ${{outputs.meta_path}} diff --git a/mlops/london_taxi/components/predict.yml b/mlops/london_taxi/components/predict.yml index 8961773f..ba34092a 100644 --- a/mlops/london_taxi/components/predict.yml +++ b/mlops/london_taxi/components/predict.yml @@ -14,7 +14,7 @@ outputs: environment: azureml:AzureML-sklearn-1.1-ubuntu20.04-py38-cpu@latest code: ./../../../ command: >- - python -m src.london_src.predict.predict + python -m src.london_taxi.predict.predict --model_input ${{inputs.model_input}} --test_data ${{inputs.test_data}} --predictions ${{outputs.predictions}} diff --git a/mlops/london_taxi/components/prep.yml b/mlops/london_taxi/components/prep.yml index 5d82157e..528b110a 100644 --- a/mlops/london_taxi/components/prep.yml +++ b/mlops/london_taxi/components/prep.yml @@ -12,7 +12,7 @@ outputs: code: ./../../../ environment: azureml:AzureML-sklearn-1.1-ubuntu20.04-py38-cpu@latest command: >- - python -m src.london_src.prep.prep + python -m src.london_taxi.prep.prep --raw_data ${{inputs.raw_data}} --prep_data ${{outputs.prep_data}} diff --git a/mlops/london_taxi/components/register.yml b/mlops/london_taxi/components/register.yml index be59138b..cf885451 100644 --- a/mlops/london_taxi/components/register.yml +++ b/mlops/london_taxi/components/register.yml @@ -15,7 +15,7 @@ inputs: code: ./../../../ environment: azureml:AzureML-sklearn-1.1-ubuntu20.04-py38-cpu@latest command: >- - python -m src.london_src.register.register + python -m src.london_taxi.register.register --model_metadata ${{inputs.model_metadata}} --model_name ${{inputs.model_name}} --score_report ${{inputs.score_report}} diff --git a/mlops/london_taxi/components/score.yml b/mlops/london_taxi/components/score.yml index 890823ca..910b32fc 100644 --- a/mlops/london_taxi/components/score.yml +++ b/mlops/london_taxi/components/score.yml @@ -14,7 +14,7 @@ outputs: environment: azureml:AzureML-sklearn-1.1-ubuntu20.04-py38-cpu@latest code: ./../../../ command: >- - python -m src.london_src.score.score + python -m src.london_taxi.score.score --predictions ${{inputs.predictions}} --model ${{inputs.model}} --score_report ${{outputs.score_report}} diff --git a/mlops/london_taxi/components/train.yml b/mlops/london_taxi/components/train.yml index 5f2b6f54..2a943f2c 100644 --- a/mlops/london_taxi/components/train.yml +++ b/mlops/london_taxi/components/train.yml @@ -16,7 +16,7 @@ outputs: code: ./../../../ environment: azureml:AzureML-sklearn-1.1-ubuntu20.04-py38-cpu@latest command: >- - python -m src.london_src.train.train + python -m src.london_taxi.train.train --training_data ${{inputs.training_data}} --test_data ${{outputs.test_data}} --model_output ${{outputs.model_output}} diff --git a/mlops/london_taxi/components/transform.yml b/mlops/london_taxi/components/transform.yml index 9d4bdea6..a178116f 100644 --- a/mlops/london_taxi/components/transform.yml +++ b/mlops/london_taxi/components/transform.yml @@ -12,7 +12,7 @@ outputs: code: ./../../../ environment: azureml:AzureML-sklearn-1.1-ubuntu20.04-py38-cpu@latest command: >- - python -m src.london_src.transform.transform + python -m src.london_taxi.transform.transform --clean_data ${{inputs.clean_data}} --transformed_data ${{outputs.transformed_data}} diff --git a/mlops/nyc_taxi/components/predict.yml b/mlops/nyc_taxi/components/predict.yml index 1bd3ff6c..da322d70 100644 --- a/mlops/nyc_taxi/components/predict.yml +++ b/mlops/nyc_taxi/components/predict.yml @@ -14,7 +14,7 @@ outputs: environment: azureml:AzureML-sklearn-1.0-ubuntu20.04-py38-cpu@latest code: ./../../../ command: >- - python -m src.nyc_src.predict.predict + python -m src.nyc_taxi.predict.predict --model_input ${{inputs.model_input}} --test_data ${{inputs.test_data}} --predictions ${{outputs.predictions}} diff --git a/mlops/nyc_taxi/components/prep.yml b/mlops/nyc_taxi/components/prep.yml index e13dfe84..234dff91 100644 --- a/mlops/nyc_taxi/components/prep.yml +++ b/mlops/nyc_taxi/components/prep.yml @@ -12,7 +12,7 @@ outputs: code: ./../../../ environment: azureml:AzureML-sklearn-1.0-ubuntu20.04-py38-cpu@latest command: >- - python -m src.nyc_src.prep.prep + python -m src.nyc_taxi.prep.prep --raw_data ${{inputs.raw_data}} --prep_data ${{outputs.prep_data}} diff --git a/mlops/nyc_taxi/components/register.yml b/mlops/nyc_taxi/components/register.yml index ad648c8c..bbfa5290 100644 --- a/mlops/nyc_taxi/components/register.yml +++ b/mlops/nyc_taxi/components/register.yml @@ -15,7 +15,7 @@ inputs: code: ./../../../ environment: azureml:AzureML-sklearn-1.0-ubuntu20.04-py38-cpu@latest command: >- - python -m src.nyc_src.register.register + python -m src.nyc_taxi.register.register --model_metadata ${{inputs.model_metadata}} --model_name ${{inputs.model_name}} --score_report ${{inputs.score_report}} diff --git a/mlops/nyc_taxi/components/score.yml b/mlops/nyc_taxi/components/score.yml index 044afef5..e55b4c57 100644 --- a/mlops/nyc_taxi/components/score.yml +++ b/mlops/nyc_taxi/components/score.yml @@ -14,7 +14,7 @@ outputs: environment: azureml:AzureML-sklearn-1.0-ubuntu20.04-py38-cpu@latest code: ./../../../ command: >- - python -m src.nyc_src.score.score + python -m src.nyc_taxi.score.score --predictions ${{inputs.predictions}} --model ${{inputs.model}} --score_report ${{outputs.score_report}} diff --git a/mlops/nyc_taxi/components/train.yml b/mlops/nyc_taxi/components/train.yml index 933fbf58..52a9de31 100644 --- a/mlops/nyc_taxi/components/train.yml +++ b/mlops/nyc_taxi/components/train.yml @@ -16,7 +16,7 @@ outputs: code: ./../../../ environment: azureml:AzureML-sklearn-1.0-ubuntu20.04-py38-cpu@latest command: >- - python -m src.nyc_src.train.train + python -m src.nyc_taxi.train.train --training_data ${{inputs.training_data}} --test_data ${{outputs.test_data}} --model_output ${{outputs.model_output}} diff --git a/mlops/nyc_taxi/components/transform.yml b/mlops/nyc_taxi/components/transform.yml index c8c66a1b..2fccd5fa 100644 --- a/mlops/nyc_taxi/components/transform.yml +++ b/mlops/nyc_taxi/components/transform.yml @@ -12,7 +12,7 @@ outputs: code: ./../../../ environment: azureml:AzureML-sklearn-1.0-ubuntu20.04-py38-cpu@latest command: >- - python -m src.nyc_src.transform.transform + python -m src.nyc_taxi.transform.transform --clean_data ${{inputs.clean_data}} --transformed_data ${{outputs.transformed_data}} From 46e9af4c5b5cc248f83c684a0b475c56fdc538f0 Mon Sep 17 00:00:00 2001 From: Kristin Ottofy Date: Mon, 28 Oct 2024 20:31:16 +0000 Subject: [PATCH 06/16] restore cd workflow --- .github/workflows/docker_taxi_cd_pipeline.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/docker_taxi_cd_pipeline.yml b/.github/workflows/docker_taxi_cd_pipeline.yml index b28b9cff..1d53daf5 100644 --- a/.github/workflows/docker_taxi_cd_pipeline.yml +++ b/.github/workflows/docker_taxi_cd_pipeline.yml @@ -1,11 +1,7 @@ name: Custom Object Detection CD Workflow -# on: -# push: -# branches: -# - main on: - pull_request: + push: branches: - main paths: From 55e1c9fa38002410464b62c088f674f754dbe8c1 Mon Sep 17 00:00:00 2001 From: Kristin Ottofy Date: Mon, 28 Oct 2024 20:43:59 +0000 Subject: [PATCH 07/16] try fix cd pipeline and test --- .azure-pipelines/docker_taxi_cd_pipeline.yml | 11 +++++++++-- .github/workflows/platform_cd_workflow.yml | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/docker_taxi_cd_pipeline.yml b/.azure-pipelines/docker_taxi_cd_pipeline.yml index bffeeb5c..e1ec9a6a 100644 --- a/.azure-pipelines/docker_taxi_cd_pipeline.yml +++ b/.azure-pipelines/docker_taxi_cd_pipeline.yml @@ -1,5 +1,12 @@ -pr: none -trigger: +# pr: none +# trigger: +# branches: +# include: +# - main +# paths: +# include: +trigger: none +pr: branches: include: - main diff --git a/.github/workflows/platform_cd_workflow.yml b/.github/workflows/platform_cd_workflow.yml index 361f521d..fb718f1c 100644 --- a/.github/workflows/platform_cd_workflow.yml +++ b/.github/workflows/platform_cd_workflow.yml @@ -94,6 +94,7 @@ jobs: shell: bash run: | [ -d "src/${{ inputs.model_type }}/common/" ] && cp -r src/${{ inputs.model_type }}/common/* model/${{ inputs.model_type }}/online + continue-on-error: true - name: Provision azureml online endpoint uses: ./.github/actions/execute_shell_code From ccee44a508c4d252dda6d084208c414dad46fe47 Mon Sep 17 00:00:00 2001 From: Kristin Ottofy Date: Tue, 29 Oct 2024 13:10:54 +0000 Subject: [PATCH 08/16] temporarily test pipeline with common folder --- .github/workflows/sequence_model_cd_pipeline.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sequence_model_cd_pipeline.yml b/.github/workflows/sequence_model_cd_pipeline.yml index 2680aa84..64f48c2c 100644 --- a/.github/workflows/sequence_model_cd_pipeline.yml +++ b/.github/workflows/sequence_model_cd_pipeline.yml @@ -1,6 +1,10 @@ name: Sequence Model CD Workflow +# on: +# push: +# branches: +# - main on: - push: + pull_request: branches: - main paths: From 79910e264af2040bbd72e222fa32cf56ac112f91 Mon Sep 17 00:00:00 2001 From: Kristin Ottofy Date: Tue, 29 Oct 2024 13:12:09 +0000 Subject: [PATCH 09/16] update continue on error --- .github/workflows/platform_cd_workflow.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/platform_cd_workflow.yml b/.github/workflows/platform_cd_workflow.yml index fb718f1c..b34a3f6f 100644 --- a/.github/workflows/platform_cd_workflow.yml +++ b/.github/workflows/platform_cd_workflow.yml @@ -93,8 +93,7 @@ jobs: - name: Copy common files shell: bash run: | - [ -d "src/${{ inputs.model_type }}/common/" ] && cp -r src/${{ inputs.model_type }}/common/* model/${{ inputs.model_type }}/online - continue-on-error: true + [ -d "src/${{ inputs.model_type }}/common/" ] && cp -r src/${{ inputs.model_type }}/common/* model/${{ inputs.model_type }}/online || true - name: Provision azureml online endpoint uses: ./.github/actions/execute_shell_code From 7bfa8f67e5b2aebed54b57f43d8730f917d31e21 Mon Sep 17 00:00:00 2001 From: Kristin Ottofy Date: Tue, 29 Oct 2024 13:35:48 +0000 Subject: [PATCH 10/16] restire azure pipeline --- .azure-pipelines/docker_taxi_cd_pipeline.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.azure-pipelines/docker_taxi_cd_pipeline.yml b/.azure-pipelines/docker_taxi_cd_pipeline.yml index e1ec9a6a..bffeeb5c 100644 --- a/.azure-pipelines/docker_taxi_cd_pipeline.yml +++ b/.azure-pipelines/docker_taxi_cd_pipeline.yml @@ -1,12 +1,5 @@ -# pr: none -# trigger: -# branches: -# include: -# - main -# paths: -# include: -trigger: none -pr: +pr: none +trigger: branches: include: - main From 3ec45055f4f6dc5bfbfad432a8d95d5dfb85c70e Mon Sep 17 00:00:00 2001 From: Kristin Ottofy Date: Tue, 29 Oct 2024 13:36:27 +0000 Subject: [PATCH 11/16] temporarily test cd workflow --- .github/workflows/docker_taxi_cd_pipeline.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker_taxi_cd_pipeline.yml b/.github/workflows/docker_taxi_cd_pipeline.yml index 1d53daf5..69119e38 100644 --- a/.github/workflows/docker_taxi_cd_pipeline.yml +++ b/.github/workflows/docker_taxi_cd_pipeline.yml @@ -1,7 +1,11 @@ name: Custom Object Detection CD Workflow - +# TODO +# on: +# push: +# branches: +# - main on: - push: + pull_request: branches: - main paths: From fc5c90d81f3ee25d532a4f34205a79e30bcf8a9b Mon Sep 17 00:00:00 2001 From: Kristin Ottofy Date: Tue, 29 Oct 2024 13:37:51 +0000 Subject: [PATCH 12/16] update copy common files if error for batch --- .github/workflows/platform_cd_workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/platform_cd_workflow.yml b/.github/workflows/platform_cd_workflow.yml index b34a3f6f..1bee8950 100644 --- a/.github/workflows/platform_cd_workflow.yml +++ b/.github/workflows/platform_cd_workflow.yml @@ -151,7 +151,7 @@ jobs: - name: Copy common files shell: bash run: | - [ -d "src/${{ inputs.model_type }}/common/" ] && cp -r src/${{ inputs.model_type }}/common/* model/${{ inputs.model_type }}/batch + [ -d "src/${{ inputs.model_type }}/common/" ] && cp -r src/${{ inputs.model_type }}/common/* model/${{ inputs.model_type }}/batch || true - name: Provision azureml batch endpoint uses: ./.github/actions/execute_shell_code From 660cc7af7a8861eeffec5e6adbcf4c96ed73318a Mon Sep 17 00:00:00 2001 From: Kristin Ottofy Date: Tue, 29 Oct 2024 14:27:31 +0000 Subject: [PATCH 13/16] restore cd pipelines --- .github/workflows/docker_taxi_cd_pipeline.yml | 11 ++++------- .github/workflows/sequence_model_cd_pipeline.yml | 10 ++++------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.github/workflows/docker_taxi_cd_pipeline.yml b/.github/workflows/docker_taxi_cd_pipeline.yml index 69119e38..c1af9d00 100644 --- a/.github/workflows/docker_taxi_cd_pipeline.yml +++ b/.github/workflows/docker_taxi_cd_pipeline.yml @@ -1,11 +1,7 @@ name: Custom Object Detection CD Workflow -# TODO -# on: -# push: -# branches: -# - main + on: - pull_request: + push: branches: - main paths: @@ -28,7 +24,8 @@ on: default: "docker_taxi" permissions: id-token: write - contents: read + contents: read + jobs: run-cd-workflow: uses: ./.github/workflows/platform_cd_workflow.yml diff --git a/.github/workflows/sequence_model_cd_pipeline.yml b/.github/workflows/sequence_model_cd_pipeline.yml index 64f48c2c..26c29d41 100644 --- a/.github/workflows/sequence_model_cd_pipeline.yml +++ b/.github/workflows/sequence_model_cd_pipeline.yml @@ -1,10 +1,7 @@ name: Sequence Model CD Workflow -# on: -# push: -# branches: -# - main + on: - pull_request: + push: branches: - main paths: @@ -28,7 +25,8 @@ on: default: "sequence_model" permissions: id-token: write - contents: read + contents: read + jobs: run-ci-workflow: uses: ./.github/workflows/platform_cd_workflow.yml From ceb8981636648e508cf397fe6d4223dd0d1e3909 Mon Sep 17 00:00:00 2001 From: Kristin Ottofy Date: Tue, 29 Oct 2024 15:39:52 +0000 Subject: [PATCH 14/16] try continue on error --- .github/workflows/platform_cd_workflow.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/platform_cd_workflow.yml b/.github/workflows/platform_cd_workflow.yml index 1bee8950..edb70e21 100644 --- a/.github/workflows/platform_cd_workflow.yml +++ b/.github/workflows/platform_cd_workflow.yml @@ -93,7 +93,8 @@ jobs: - name: Copy common files shell: bash run: | - [ -d "src/${{ inputs.model_type }}/common/" ] && cp -r src/${{ inputs.model_type }}/common/* model/${{ inputs.model_type }}/online || true + [ -d "src/${{ inputs.model_type }}/common/" ] && cp -r src/${{ inputs.model_type }}/common/* model/${{ inputs.model_type }}/online + continue-on-error: true - name: Provision azureml online endpoint uses: ./.github/actions/execute_shell_code @@ -151,7 +152,8 @@ jobs: - name: Copy common files shell: bash run: | - [ -d "src/${{ inputs.model_type }}/common/" ] && cp -r src/${{ inputs.model_type }}/common/* model/${{ inputs.model_type }}/batch || true + [ -d "src/${{ inputs.model_type }}/common/" ] && cp -r src/${{ inputs.model_type }}/common/* model/${{ inputs.model_type }}/batch + continue-on-error: true - name: Provision azureml batch endpoint uses: ./.github/actions/execute_shell_code From 92c4d5b2b15121cf01d61a739eabbc52179f8773 Mon Sep 17 00:00:00 2001 From: Kristin Ottofy Date: Tue, 29 Oct 2024 15:40:38 +0000 Subject: [PATCH 15/16] test cd workflow --- .github/workflows/docker_taxi_cd_pipeline.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker_taxi_cd_pipeline.yml b/.github/workflows/docker_taxi_cd_pipeline.yml index c1af9d00..39a318b1 100644 --- a/.github/workflows/docker_taxi_cd_pipeline.yml +++ b/.github/workflows/docker_taxi_cd_pipeline.yml @@ -1,7 +1,12 @@ name: Custom Object Detection CD Workflow +# on: +# push: +# branches: +# - main +# TODO on: - push: + pull_request: branches: - main paths: From 0478a485ca76f203e40fe57c764fa05f05918496 Mon Sep 17 00:00:00 2001 From: Kristin Ottofy Date: Tue, 29 Oct 2024 16:20:45 +0000 Subject: [PATCH 16/16] restore --- .github/workflows/docker_taxi_cd_pipeline.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/docker_taxi_cd_pipeline.yml b/.github/workflows/docker_taxi_cd_pipeline.yml index 39a318b1..c1af9d00 100644 --- a/.github/workflows/docker_taxi_cd_pipeline.yml +++ b/.github/workflows/docker_taxi_cd_pipeline.yml @@ -1,12 +1,7 @@ name: Custom Object Detection CD Workflow -# on: -# push: -# branches: -# - main -# TODO on: - pull_request: + push: branches: - main paths: