Merge branch 'master' into feature/share-tags

Author: odeimaiz

ci/github/helpers/install_7zip.bash

@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+#  Installs the latest version of 7zip plugin
+#
+
+# http://redsymbol.net/articles/unofficial-bash-strict-mode/
+set -o errexit   # abort on nonzero exitstatus
+set -o nounset   # abort on unbound variable
+set -o pipefail  # don't hide errors within pipes
+IFS=$'\n\t'
+
+exec "$( dirname -- "$0"; )"/../../../scripts/install_7zip.bash

ci/github/integration-testing/dynamic-sidecar.bash

@@ -9,6 +9,7 @@ install() {
   make devenv
   # shellcheck source=/dev/null
   source .venv/bin/activate
+  sudo ./ci/github/helpers/install_7zip.bash
   pushd services/dynamic-sidecar
   make install-ci
   popd

ci/github/integration-testing/webserver.bash

@@ -9,6 +9,7 @@ install() {
   make devenv
   # shellcheck source=/dev/null
   source .venv/bin/activate
+  sudo ./ci/github/helpers/install_7zip.bash
   pushd services/web/server
   make install-ci
   popd

ci/github/unit-testing/dynamic-sidecar.bash

@@ -9,6 +9,7 @@ install() {
   make devenv
   # shellcheck source=/dev/null
   source .venv/bin/activate
+  sudo ./ci/github/helpers/install_7zip.bash
   pushd services/dynamic-sidecar
   make install-ci
   popd

ci/github/unit-testing/service-library.bash

@@ -10,6 +10,7 @@ install_all() {
   make devenv
   # shellcheck source=/dev/null
   source .venv/bin/activate
+  sudo ./ci/github/helpers/install_7zip.bash
   pushd packages/service-library
   make "install-ci[all]"
   popd

packages/aws-library/requirements/_base.txt

@@ -313,8 +313,6 @@ referencing==0.29.3
     # via
     #   jsonschema
     #   jsonschema-specifications
-repro-zipfile==0.3.1
-    # via -r requirements/../../../packages/service-library/requirements/_base.in
 requests==2.32.3
     # via opentelemetry-exporter-otlp-proto-http
 rich==13.8.1

packages/models-library/src/models_library/workspaces.py

@@ -36,6 +36,7 @@ def validate_workspace_id(cls, value, info: ValidationInfo):
         if scope == WorkspaceScope.SHARED and value is None:
             msg = f"workspace_id must be provided when workspace_scope is SHARED. Got {scope=}, {value=}"
             raise ValueError(msg)
+
         if scope != WorkspaceScope.SHARED and value is not None:
             msg = f"workspace_id should be None when workspace_scope is not SHARED. Got {scope=}, {value=}"
             raise ValueError(msg)

packages/service-library/requirements/_base.in

@@ -27,7 +27,6 @@ pydantic
 pyinstrument
 pyyaml
 redis
-repro-zipfile
 tenacity
 toolz
 tqdm

packages/service-library/requirements/_base.txt

@@ -223,8 +223,6 @@ referencing==0.29.3
     # via
     #   jsonschema
     #   jsonschema-specifications
-repro-zipfile==0.3.1
-    # via -r requirements/_base.in
 requests==2.32.3
     # via opentelemetry-exporter-otlp-proto-http
 rich==13.8.1