From 569d8d45502684c61d53b6e185ef212c6bcf67c1 Mon Sep 17 00:00:00 2001 From: Tanvi Raja Date: Wed, 18 Sep 2024 16:36:09 +0000 Subject: [PATCH 1/7] Add in references for Mast Center and North San Juan Center --- InferenceSystem/Dockerfile | 2 +- .../Production/FastAI_LiveHLS_MastCenter.yml | 10 +++++ .../Production/FastAI_LiveHLS_NorthSJC.yml | 10 +++++ InferenceSystem/deploy-aci.yaml | 30 +++++++++++++++ InferenceSystem/deploy/mast-center.yaml | 38 +++++++++++++++++++ InferenceSystem/deploy/north-san-juan.yaml | 38 +++++++++++++++++++ .../src/LiveInferenceOrchestrator.py | 4 +- InferenceSystem/src/globals.py | 10 +++++ 8 files changed, 140 insertions(+), 2 deletions(-) create mode 100644 InferenceSystem/config/Production/FastAI_LiveHLS_MastCenter.yml create mode 100644 InferenceSystem/config/Production/FastAI_LiveHLS_NorthSJC.yml create mode 100644 InferenceSystem/deploy/mast-center.yaml create mode 100644 InferenceSystem/deploy/north-san-juan.yaml diff --git a/InferenceSystem/Dockerfile b/InferenceSystem/Dockerfile index de6031ef..014e7b75 100644 --- a/InferenceSystem/Dockerfile +++ b/InferenceSystem/Dockerfile @@ -29,4 +29,4 @@ RUN rm ./model.zip COPY ./src/ ./src COPY ./config/ ./config -CMD ["python3", "-u", "./src/LiveInferenceOrchestrator.py", "--config", "./config/Production/FastAI_LiveHLS_OrcasoundLab.yml"] +CMD ["python3", "-u", "./src/LiveInferenceOrchestrator.py", "--config", "./config/Production/FastAI_LiveHLS_MastCenter.yml"] diff --git a/InferenceSystem/config/Production/FastAI_LiveHLS_MastCenter.yml b/InferenceSystem/config/Production/FastAI_LiveHLS_MastCenter.yml new file mode 100644 index 00000000..a7e68fd7 --- /dev/null +++ b/InferenceSystem/config/Production/FastAI_LiveHLS_MastCenter.yml @@ -0,0 +1,10 @@ +model_type: "FastAI" +model_local_threshold: 0.5 +model_global_threshold: 3 +model_path: "./model" +model_name: "model.pkl" +hls_stream_type: "LiveHLS" +hls_polling_interval: 60 +hls_hydrophone_id: "rpi_mast_center" +upload_to_azure: True +delete_local_wavs: True diff --git a/InferenceSystem/config/Production/FastAI_LiveHLS_NorthSJC.yml b/InferenceSystem/config/Production/FastAI_LiveHLS_NorthSJC.yml new file mode 100644 index 00000000..567bd685 --- /dev/null +++ b/InferenceSystem/config/Production/FastAI_LiveHLS_NorthSJC.yml @@ -0,0 +1,10 @@ +model_type: "FastAI" +model_local_threshold: 0.5 +model_global_threshold: 3 +model_path: "./model" +model_name: "model.pkl" +hls_stream_type: "LiveHLS" +hls_polling_interval: 60 +hls_hydrophone_id: "rpi_north_sjc" +upload_to_azure: True +delete_local_wavs: True diff --git a/InferenceSystem/deploy-aci.yaml b/InferenceSystem/deploy-aci.yaml index d8bee941..ad2271eb 100644 --- a/InferenceSystem/deploy-aci.yaml +++ b/InferenceSystem/deploy-aci.yaml @@ -80,6 +80,36 @@ properties: requests: cpu: 1.0 memoryInGB: 3 + - name: mast-center-live + properties: + environmentVariables: + - name: AZURE_COSMOSDB_PRIMARY_KEY + secureValue: '' + - name: AZURE_STORAGE_CONNECTION_STRING + secureValue: '' + - name: INFERENCESYSTEM_APPINSIGHTS_CONNECTION_STRING + secureValue: '' + image: orcaconservancycr.azurecr.io/live-inference-system:11-15-20.FastAI.R1-12.MastCenter.v0 + ports: [] + resources: + requests: + cpu: 1.0 + memoryInGB: 3 + - name: north-sjc-live + properties: + environmentVariables: + - name: AZURE_COSMOSDB_PRIMARY_KEY + secureValue: '' + - name: AZURE_STORAGE_CONNECTION_STRING + secureValue: '' + - name: INFERENCESYSTEM_APPINSIGHTS_CONNECTION_STRING + secureValue: '' + image: orcaconservancycr.azurecr.io/live-inference-system:11-15-20.FastAI.R1-12.NorthSJC.v0 + ports: [] + resources: + requests: + cpu: 1.0 + memoryInGB: 3 imageRegistryCredentials: - server: orcaconservancycr.azurecr.io username: orcaconservancycr diff --git a/InferenceSystem/deploy/mast-center.yaml b/InferenceSystem/deploy/mast-center.yaml new file mode 100644 index 00000000..12f3c4d2 --- /dev/null +++ b/InferenceSystem/deploy/mast-center.yaml @@ -0,0 +1,38 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: inference-system + namespace: mast-center +spec: + replicas: 1 + selector: + matchLabels: + app: inference-system + template: + metadata: + labels: + app: inference-system + spec: + containers: + - name: inference-system + image: orcaconservancycr.azurecr.io/live-inference-system:11-15-20.FastAI.R1-12.MastCenter.v0 + resources: + limits: + cpu: 1 + memory: 3G + env: + - name: AZURE_COSMOSDB_PRIMARY_KEY + valueFrom: + secretKeyRef: + name: inference-system + key: AZURE_COSMOSDB_PRIMARY_KEY + - name: AZURE_STORAGE_CONNECTION_STRING + valueFrom: + secretKeyRef: + name: inference-system + key: AZURE_STORAGE_CONNECTION_STRING + - name: INFERENCESYSTEM_APPINSIGHTS_CONNECTION_STRING + valueFrom: + secretKeyRef: + name: inference-system + key: INFERENCESYSTEM_APPINSIGHTS_CONNECTION_STRING diff --git a/InferenceSystem/deploy/north-san-juan.yaml b/InferenceSystem/deploy/north-san-juan.yaml new file mode 100644 index 00000000..01b7ebb5 --- /dev/null +++ b/InferenceSystem/deploy/north-san-juan.yaml @@ -0,0 +1,38 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: inference-system + namespace: north-sjc +spec: + replicas: 1 + selector: + matchLabels: + app: inference-system + template: + metadata: + labels: + app: inference-system + spec: + containers: + - name: inference-system + image: orcaconservancycr.azurecr.io/live-inference-system:11-15-20.FastAI.R1-12.NorthSJC.v0 + resources: + limits: + cpu: 1 + memory: 3G + env: + - name: AZURE_COSMOSDB_PRIMARY_KEY + valueFrom: + secretKeyRef: + name: inference-system + key: AZURE_COSMOSDB_PRIMARY_KEY + - name: AZURE_STORAGE_CONNECTION_STRING + valueFrom: + secretKeyRef: + name: inference-system + key: AZURE_STORAGE_CONNECTION_STRING + - name: INFERENCESYSTEM_APPINSIGHTS_CONNECTION_STRING + valueFrom: + secretKeyRef: + name: inference-system + key: INFERENCESYSTEM_APPINSIGHTS_CONNECTION_STRING diff --git a/InferenceSystem/src/LiveInferenceOrchestrator.py b/InferenceSystem/src/LiveInferenceOrchestrator.py index e39f21a8..676dce63 100644 --- a/InferenceSystem/src/LiveInferenceOrchestrator.py +++ b/InferenceSystem/src/LiveInferenceOrchestrator.py @@ -38,8 +38,10 @@ BUSH_POINT_LOCATION = {"id": "rpi_bush_point", "name": "Bush Point", "longitude": -122.6039, "latitude": 48.03371} SUNSET_BAY_LOCATION = {"id": "rpi_sunset_bay", "name": "Sunset Bay", "longitude": -122.3339, "latitude": 47.86497} POINT_ROBINSON_LOCATION = {"id": "rpi_point_robinson", "name": "Point Robinson", "longitude": -122.37267, "latitude": 47.38838} +MAST_CENTER_LOCATION = {"id": "rpi_mast_center", "name": "Mast Center", "longitude": -122.32512, "latitude": 47.34922} +NORTH_SJC_LOCATION = {"id": "rpi_north_sjc", "name": "North SJC", "longitude": -122.32512, "latitude": 47.34922} -source_guid_to_location = {"rpi_orcasound_lab" : ORCASOUND_LAB_LOCATION, "rpi_port_townsend" : PORT_TOWNSEND_LOCATION, "rpi_bush_point": BUSH_POINT_LOCATION, "rpi_sunset_bay": SUNSET_BAY_LOCATION, "rpi_point_robinson": POINT_ROBINSON_LOCATION } +source_guid_to_location = {"rpi_orcasound_lab" : ORCASOUND_LAB_LOCATION, "rpi_port_townsend" : PORT_TOWNSEND_LOCATION, "rpi_bush_point": BUSH_POINT_LOCATION, "rpi_sunset_bay": SUNSET_BAY_LOCATION, "rpi_point_robinson": POINT_ROBINSON_LOCATION, "rpi_mast_center": MAST_CENTER_LOCATION, "rpi_north_sjc": NORTH_SJC_LOCATION} def assemble_blob_uri(container_name, item_name): diff --git a/InferenceSystem/src/globals.py b/InferenceSystem/src/globals.py index 94118c0a..8c82664c 100644 --- a/InferenceSystem/src/globals.py +++ b/InferenceSystem/src/globals.py @@ -1,11 +1,21 @@ import datetime S3_STREAM_URLS = { +<<<<<<< HEAD "orcasound_lab": "https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_orcasound_lab", "port_townsend": "https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_port_townsend", "bush_point": "https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_bush_point", "sunset_bay": "https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_sunset_bay", "point_robinson": "https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_point_robinson", +======= + "orcasound_lab": "https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_orcasound_lab", + "port_townsend": "https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_port_townsend", + "bush_point": "https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_bush_point", + "sunset_bay": "https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_sunset_bay", + "point_robinson": "https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_point_robinson", + "mast_center": "https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_mast_center", + "north_sjc": "https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_north_sjc" +>>>>>>> ed567fc (Add in references for Mast Center and North San Juan Center) } # Limits time window (end - start) of negative samples to be downloaded for retraining From f444e62d17d7c937369a0a65a5be3ec5d3a6f43d Mon Sep 17 00:00:00 2001 From: Tanvi Raja Date: Wed, 18 Sep 2024 18:35:30 +0000 Subject: [PATCH 2/7] Update files for Mast Center and North JSC --- .../deploy/{north-san-juan.yaml => north-sjc.yaml} | 0 InferenceSystem/src/globals.py | 12 ++---------- 2 files changed, 2 insertions(+), 10 deletions(-) rename InferenceSystem/deploy/{north-san-juan.yaml => north-sjc.yaml} (100%) diff --git a/InferenceSystem/deploy/north-san-juan.yaml b/InferenceSystem/deploy/north-sjc.yaml similarity index 100% rename from InferenceSystem/deploy/north-san-juan.yaml rename to InferenceSystem/deploy/north-sjc.yaml diff --git a/InferenceSystem/src/globals.py b/InferenceSystem/src/globals.py index 8c82664c..23eb14c7 100644 --- a/InferenceSystem/src/globals.py +++ b/InferenceSystem/src/globals.py @@ -1,21 +1,13 @@ import datetime S3_STREAM_URLS = { -<<<<<<< HEAD "orcasound_lab": "https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_orcasound_lab", "port_townsend": "https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_port_townsend", "bush_point": "https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_bush_point", "sunset_bay": "https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_sunset_bay", "point_robinson": "https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_point_robinson", -======= - "orcasound_lab": "https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_orcasound_lab", - "port_townsend": "https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_port_townsend", - "bush_point": "https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_bush_point", - "sunset_bay": "https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_sunset_bay", - "point_robinson": "https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_point_robinson", - "mast_center": "https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_mast_center", - "north_sjc": "https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_north_sjc" ->>>>>>> ed567fc (Add in references for Mast Center and North San Juan Center) + "mast_center": "https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_mast_center", + "north_sjc": "https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_north_sjc" } # Limits time window (end - start) of negative samples to be downloaded for retraining From 59e9ca3feffdb6e32b800833cf593bb222fd470d Mon Sep 17 00:00:00 2001 From: Tanvi Raja Date: Thu, 19 Sep 2024 14:59:15 +0000 Subject: [PATCH 3/7] Updated bucket version and re-deployed all 5 hydrophones --- InferenceSystem/deploy-aci.yaml | 10 +++++----- InferenceSystem/deploy/bush-point.yaml | 2 +- InferenceSystem/deploy/orcasound-lab.yaml | 2 +- InferenceSystem/deploy/point-robinson.yaml | 2 +- InferenceSystem/deploy/port-townsend.yaml | 2 +- InferenceSystem/deploy/sunset-bay.yaml | 2 +- InferenceSystem/src/LiveInferenceOrchestrator.py | 1 + 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/InferenceSystem/deploy-aci.yaml b/InferenceSystem/deploy-aci.yaml index ad2271eb..c745a6e0 100644 --- a/InferenceSystem/deploy-aci.yaml +++ b/InferenceSystem/deploy-aci.yaml @@ -14,7 +14,7 @@ properties: secureValue: '' - name: INFERENCESYSTEM_APPINSIGHTS_CONNECTION_STRING secureValue: '' - image: orcaconservancycr.azurecr.io/live-inference-system:11-15-20.FastAI.R1-12.OrcasoundLab.v0 + image: orcaconservancycr.azurecr.io/live-inference-system:09-18-24.FastAI.R1-12.OrcasoundLab.v0 ports: [] resources: requests: @@ -29,7 +29,7 @@ properties: secureValue: '' - name: INFERENCESYSTEM_APPINSIGHTS_CONNECTION_STRING secureValue: '' - image: orcaconservancycr.azurecr.io/live-inference-system:11-15-20.FastAI.R1-12.PortTownsend.v0 + image: orcaconservancycr.azurecr.io/live-inference-system:09-18-24.FastAI.R1-12.PortTownsend.v0 ports: [] resources: requests: @@ -44,7 +44,7 @@ properties: secureValue: '' - name: INFERENCESYSTEM_APPINSIGHTS_CONNECTION_STRING secureValue: '' - image: orcaconservancycr.azurecr.io/live-inference-system:11-15-20.FastAI.R1-12.BushPoint.v0 + image: orcaconservancycr.azurecr.io/live-inference-system:09-19-24.FastAI.R1-12.BushPoint.v0 ports: [] resources: requests: @@ -59,7 +59,7 @@ properties: secureValue: '' - name: INFERENCESYSTEM_APPINSIGHTS_CONNECTION_STRING secureValue: '' - image: orcaconservancycr.azurecr.io/live-inference-system:11-15-20.FastAI.R1-12.SunsetBay.v0 + image: orcaconservancycr.azurecr.io/live-inference-system:09-19-24.FastAI.R1-12.SunsetBay.v0 ports: [] resources: requests: @@ -74,7 +74,7 @@ properties: secureValue: '' - name: INFERENCESYSTEM_APPINSIGHTS_CONNECTION_STRING secureValue: '' - image: orcaconservancycr.azurecr.io/live-inference-system:11-15-20.FastAI.R1-12.PointRobinson.v0 + image: orcaconservancycr.azurecr.io/live-inference-system:09-18-24.FastAI.R1-12.PointRobinson.v0 ports: [] resources: requests: diff --git a/InferenceSystem/deploy/bush-point.yaml b/InferenceSystem/deploy/bush-point.yaml index 0a6b1ca7..bc71e748 100644 --- a/InferenceSystem/deploy/bush-point.yaml +++ b/InferenceSystem/deploy/bush-point.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: inference-system - image: orcaconservancycr.azurecr.io/live-inference-system:11-15-20.FastAI.R1-12.BushPoint.v0 + image: orcaconservancycr.azurecr.io/live-inference-system:09-19-24.FastAI.R1-12.BushPoint.v0 resources: limits: cpu: 1 diff --git a/InferenceSystem/deploy/orcasound-lab.yaml b/InferenceSystem/deploy/orcasound-lab.yaml index c1b02661..36acf360 100644 --- a/InferenceSystem/deploy/orcasound-lab.yaml +++ b/InferenceSystem/deploy/orcasound-lab.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: inference-system - image: orcaconservancycr.azurecr.io/live-inference-system:11-15-20.FastAI.R1-12.OrcasoundLab.v0 + image: orcaconservancycr.azurecr.io/live-inference-system:09-18-24.FastAI.R1-12.OrcasoundLab.v0 resources: limits: cpu: 1 diff --git a/InferenceSystem/deploy/point-robinson.yaml b/InferenceSystem/deploy/point-robinson.yaml index 89e7c5eb..5f231e2b 100644 --- a/InferenceSystem/deploy/point-robinson.yaml +++ b/InferenceSystem/deploy/point-robinson.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: inference-system - image: orcaconservancycr.azurecr.io/live-inference-system:11-15-20.FastAI.R1-12.PointRobinson.v0 + image: orcaconservancycr.azurecr.io/live-inference-system:09-18-24.FastAI.R1-12.PointRobinson.v0 resources: limits: cpu: 1 diff --git a/InferenceSystem/deploy/port-townsend.yaml b/InferenceSystem/deploy/port-townsend.yaml index 8697b139..e6fd85b4 100644 --- a/InferenceSystem/deploy/port-townsend.yaml +++ b/InferenceSystem/deploy/port-townsend.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: inference-system - image: orcaconservancycr.azurecr.io/live-inference-system:11-15-20.FastAI.R1-12.PortTownsend.v0 + image: orcaconservancycr.azurecr.io/live-inference-system:09-18-24.FastAI.R1-12.PortTownsend.v0 resources: limits: cpu: 1 diff --git a/InferenceSystem/deploy/sunset-bay.yaml b/InferenceSystem/deploy/sunset-bay.yaml index 53b8590a..e70a9762 100644 --- a/InferenceSystem/deploy/sunset-bay.yaml +++ b/InferenceSystem/deploy/sunset-bay.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: inference-system - image: orcaconservancycr.azurecr.io/live-inference-system:11-15-20.FastAI.R1-12.SunsetBay.v0 + image: orcaconservancycr.azurecr.io/live-inference-system:09-19-24.FastAI.R1-12.SunsetBay.v0 resources: limits: cpu: 1 diff --git a/InferenceSystem/src/LiveInferenceOrchestrator.py b/InferenceSystem/src/LiveInferenceOrchestrator.py index 676dce63..0b91b22a 100644 --- a/InferenceSystem/src/LiveInferenceOrchestrator.py +++ b/InferenceSystem/src/LiveInferenceOrchestrator.py @@ -104,6 +104,7 @@ def populate_metadata_json( # logger to app insights app_insights_connection_string = os.getenv('INFERENCESYSTEM_APPINSIGHTS_CONNECTION_STRING') + print("INSTRUMENTATION KEY: ", app_insights_connection_string) logger = logging.getLogger(__name__) if app_insights_connection_string is not None: logger.addHandler(AzureLogHandler(connection_string=app_insights_connection_string)) From 464f344cc61d8d163162ebcdec7af98bc7b7f0b3 Mon Sep 17 00:00:00 2001 From: Tanvi Raja Date: Thu, 19 Sep 2024 15:03:04 +0000 Subject: [PATCH 4/7] Update Readme for InferenceSystem --- InferenceSystem/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/InferenceSystem/README.md b/InferenceSystem/README.md index 936fd537..abf70dbe 100644 --- a/InferenceSystem/README.md +++ b/InferenceSystem/README.md @@ -104,7 +104,7 @@ python src/LiveInferenceOrchestrator.py --config ./config/Test/FastAI_LiveHLS_Or You should see the following logs in your terminal. Since this is a Test config, no audio is uploaded to Azure and no metadata is written to CosmosDB. ``` -Listening to location https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_orcasound_lab +Listening to location https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_orcasound_lab Downloading live879.ts live879.ts: 205kB [00:00, 1.17MB/s] Downloading live880.ts @@ -190,7 +190,7 @@ docker run --rm -it --env-file .env live-inference-system In addition, you should see something similar to the following in your console. ``` -Listening to location https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_orcasound_lab +Listening to location https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_orcasound_lab Downloading live879.ts live879.ts: 205kB [00:00, 1.17MB/s] Downloading live880.ts From 283a7d6340e03d7e79a4cee6bf66ca9d1ac3f3ea Mon Sep 17 00:00:00 2001 From: Tanvi Raja Date: Thu, 19 Sep 2024 16:57:17 +0000 Subject: [PATCH 5/7] Update Lat/Long for SJC and Readme --- InferenceSystem/README.md | 2 +- InferenceSystem/src/LiveInferenceOrchestrator.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/InferenceSystem/README.md b/InferenceSystem/README.md index abf70dbe..2cbc5e3f 100644 --- a/InferenceSystem/README.md +++ b/InferenceSystem/README.md @@ -176,7 +176,7 @@ docker build . -t live-inference-system -f ./Dockerfile Note: the config used in the Dockerfile is a Production config. -TODO: fix. For now, you will have to manually create 5 different docker containers for the 5 hydrophone locations. Each time you will need to edit the Dockerfile and replace the config for each hydrophone location (OrcasoundLab, BushPoint, PortTownsend, Sunset Bay and Point Robinson). +TODO: fix. For now, you will have to manually create 5 different docker containers for the 7 hydrophone locations. Each time you will need to edit the Dockerfile and replace the config for each hydrophone location (OrcasoundLab, BushPoint, PortTownsend, Sunset Bay, Point Robinson, Mast Center, and North San Juan Center). ## Running the docker container diff --git a/InferenceSystem/src/LiveInferenceOrchestrator.py b/InferenceSystem/src/LiveInferenceOrchestrator.py index 0b91b22a..d29d4b6b 100644 --- a/InferenceSystem/src/LiveInferenceOrchestrator.py +++ b/InferenceSystem/src/LiveInferenceOrchestrator.py @@ -39,7 +39,7 @@ SUNSET_BAY_LOCATION = {"id": "rpi_sunset_bay", "name": "Sunset Bay", "longitude": -122.3339, "latitude": 47.86497} POINT_ROBINSON_LOCATION = {"id": "rpi_point_robinson", "name": "Point Robinson", "longitude": -122.37267, "latitude": 47.38838} MAST_CENTER_LOCATION = {"id": "rpi_mast_center", "name": "Mast Center", "longitude": -122.32512, "latitude": 47.34922} -NORTH_SJC_LOCATION = {"id": "rpi_north_sjc", "name": "North SJC", "longitude": -122.32512, "latitude": 47.34922} +NORTH_SJC_LOCATION = {"id": "rpi_north_sjc", "name": "North SJC", "longitude": -123.058779, "latitude": 48.591294} source_guid_to_location = {"rpi_orcasound_lab" : ORCASOUND_LAB_LOCATION, "rpi_port_townsend" : PORT_TOWNSEND_LOCATION, "rpi_bush_point": BUSH_POINT_LOCATION, "rpi_sunset_bay": SUNSET_BAY_LOCATION, "rpi_point_robinson": POINT_ROBINSON_LOCATION, "rpi_mast_center": MAST_CENTER_LOCATION, "rpi_north_sjc": NORTH_SJC_LOCATION} From 69ce2fea6524d13be86ad6a603e0c6507ad1fb30 Mon Sep 17 00:00:00 2001 From: Tanvi Raja Date: Thu, 19 Sep 2024 17:54:24 +0000 Subject: [PATCH 6/7] deployed San Juan and Mast Center --- InferenceSystem/Dockerfile | 2 +- InferenceSystem/deploy-aci.yaml | 4 ++-- InferenceSystem/deploy/mast-center.yaml | 2 +- InferenceSystem/deploy/north-sjc.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/InferenceSystem/Dockerfile b/InferenceSystem/Dockerfile index 014e7b75..b2624a31 100644 --- a/InferenceSystem/Dockerfile +++ b/InferenceSystem/Dockerfile @@ -29,4 +29,4 @@ RUN rm ./model.zip COPY ./src/ ./src COPY ./config/ ./config -CMD ["python3", "-u", "./src/LiveInferenceOrchestrator.py", "--config", "./config/Production/FastAI_LiveHLS_MastCenter.yml"] +CMD ["python3", "-u", "./src/LiveInferenceOrchestrator.py", "--config", "./config/Production/FastAI_LiveHLS_NorthSJC.yml"] diff --git a/InferenceSystem/deploy-aci.yaml b/InferenceSystem/deploy-aci.yaml index c745a6e0..944ef0f3 100644 --- a/InferenceSystem/deploy-aci.yaml +++ b/InferenceSystem/deploy-aci.yaml @@ -89,7 +89,7 @@ properties: secureValue: '' - name: INFERENCESYSTEM_APPINSIGHTS_CONNECTION_STRING secureValue: '' - image: orcaconservancycr.azurecr.io/live-inference-system:11-15-20.FastAI.R1-12.MastCenter.v0 + image: orcaconservancycr.azurecr.io/live-inference-system:09-19-24.FastAI.R1-12.MastCenter.v0 ports: [] resources: requests: @@ -104,7 +104,7 @@ properties: secureValue: '' - name: INFERENCESYSTEM_APPINSIGHTS_CONNECTION_STRING secureValue: '' - image: orcaconservancycr.azurecr.io/live-inference-system:11-15-20.FastAI.R1-12.NorthSJC.v0 + image: orcaconservancycr.azurecr.io/live-inference-system:09-19-24.FastAI.R1-12.NorthSJC.v0 ports: [] resources: requests: diff --git a/InferenceSystem/deploy/mast-center.yaml b/InferenceSystem/deploy/mast-center.yaml index 12f3c4d2..a68e2afe 100644 --- a/InferenceSystem/deploy/mast-center.yaml +++ b/InferenceSystem/deploy/mast-center.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: inference-system - image: orcaconservancycr.azurecr.io/live-inference-system:11-15-20.FastAI.R1-12.MastCenter.v0 + image: orcaconservancycr.azurecr.io/live-inference-system:09-19-24.FastAI.R1-12.MastCenter.v0 resources: limits: cpu: 1 diff --git a/InferenceSystem/deploy/north-sjc.yaml b/InferenceSystem/deploy/north-sjc.yaml index 01b7ebb5..f539b766 100644 --- a/InferenceSystem/deploy/north-sjc.yaml +++ b/InferenceSystem/deploy/north-sjc.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: inference-system - image: orcaconservancycr.azurecr.io/live-inference-system:11-15-20.FastAI.R1-12.NorthSJC.v0 + image: orcaconservancycr.azurecr.io/live-inference-system:09-19-24.FastAI.R1-12.NorthSJC.v0 resources: limits: cpu: 1 From ac5ac8dc497db2350c473ab93cd18462321da03e Mon Sep 17 00:00:00 2001 From: Tanvi Raja Date: Thu, 19 Sep 2024 18:08:15 +0000 Subject: [PATCH 7/7] revert dockerfile --- InferenceSystem/Dockerfile | 2 +- InferenceSystem/deploy-aci.yaml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/InferenceSystem/Dockerfile b/InferenceSystem/Dockerfile index b2624a31..de6031ef 100644 --- a/InferenceSystem/Dockerfile +++ b/InferenceSystem/Dockerfile @@ -29,4 +29,4 @@ RUN rm ./model.zip COPY ./src/ ./src COPY ./config/ ./config -CMD ["python3", "-u", "./src/LiveInferenceOrchestrator.py", "--config", "./config/Production/FastAI_LiveHLS_NorthSJC.yml"] +CMD ["python3", "-u", "./src/LiveInferenceOrchestrator.py", "--config", "./config/Production/FastAI_LiveHLS_OrcasoundLab.yml"] diff --git a/InferenceSystem/deploy-aci.yaml b/InferenceSystem/deploy-aci.yaml index eed749bb..944ef0f3 100644 --- a/InferenceSystem/deploy-aci.yaml +++ b/InferenceSystem/deploy-aci.yaml @@ -75,7 +75,6 @@ properties: - name: INFERENCESYSTEM_APPINSIGHTS_CONNECTION_STRING secureValue: '' image: orcaconservancycr.azurecr.io/live-inference-system:09-18-24.FastAI.R1-12.PointRobinson.v0 -<<<<<<< HEAD ports: [] resources: requests: @@ -106,8 +105,6 @@ properties: - name: INFERENCESYSTEM_APPINSIGHTS_CONNECTION_STRING secureValue: '' image: orcaconservancycr.azurecr.io/live-inference-system:09-19-24.FastAI.R1-12.NorthSJC.v0 -======= ->>>>>>> main ports: [] resources: requests: