Skip to content

Commit 5954dbb

Browse files
stephen-wang24stephen-wang24
committed
revert(obs): remove sgp-obs beta changes
1 parent d88fac6 commit 5954dbb

60 files changed

Lines changed: 47 additions & 2635 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎adk/pyproject.toml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ dependencies = [
6565
# agentex/lib/* uses `from typing import override` (3.12+) in 19 files.
6666
# The slim agentex-client keeps 3.11 support.
6767
requires-python = ">= 3.12,<4"
68-
6968
classifiers = [
7069
"Typing :: Typed",
7170
"Intended Audience :: Developers",
@@ -77,23 +76,6 @@ classifiers = [
7776
"License :: OSI Approved :: Apache Software License",
7877
]
7978

80-
# No `obs` extra, deliberately — do not add one for sgp-obs.
81-
#
82-
# sgp-obs is not on public PyPI (it is served from Scale's curated CodeArtifact
83-
# mirror), and declaring it in [project.optional-dependencies] makes THIS repo's uv
84-
# workspace unresolvable: `uv sync` re-locks, locking must resolve every declared
85-
# optional dependency of every workspace member, and there is no way to exempt one.
86-
# Measured: `uv lock --check`, `uv sync --all-extras`, plain `uv sync` with no extras,
87-
# and `uv sync --all-extras --no-extra obs` all fail (`--no-extra` filters what is
88-
# installed, not what is resolved); `uv lock` has no `--no-extra`; and
89-
# `[tool.uv] override-dependencies` does not exempt it either. Only `--frozen` works,
90-
# which would leave nobody able to re-lock this repo again.
91-
#
92-
# So the dependency is the AGENT's to declare — `sgp-obs[genai-auto,http,otlp]`
93-
# against the mirror — and the SDK wires it when it is importable. See
94-
# agentex/lib/core/observability/sgp_obs_setup.py; nothing imports sgp_obs outside a
95-
# try, so a plain `pip install agentex-sdk` is unaffected either way.
96-
9779
[project.urls]
9880
Homepage = "https://github.com/scaleapi/scale-agentex-python"
9981
Repository = "https://github.com/scaleapi/scale-agentex-python"

‎src/agentex/lib/cli/templates/PRIVATE_INDEX.md‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎src/agentex/lib/cli/templates/default-claude-code/Dockerfile-uv.j2‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,34 +34,14 @@ WORKDIR /app/{{ project_path_from_build_root }}
3434
COPY {{ project_path_from_build_root }}/pyproject.toml ./
3535

3636
# Install dependencies (without project itself, for layer caching)
37-
# Optional private index for Scale-internal packages such as sgp-obs, injected by the
38-
# control-plane broker (SGPINF-1568). Inert unless the secret is present, so local
39-
# builds, CI builds, and agents that never opt in are unaffected.
40-
#
41-
# To opt in, and for why UV_INDEX is pinned to the broker's URL rather than trusting
42-
# the project's, see PRIVATE_INDEX.md in the agentex-sdk CLI templates directory.
4337
RUN --mount=type=cache,target=/root/.cache/uv \
44-
--mount=type=secret,id=codeartifact-pip-conf,required=false \
45-
if [ -s /run/secrets/codeartifact-pip-conf ]; then \
46-
export UV_INDEX="scale-pypi=$(sed -n 's#.*index-url = https://aws:[^@]*@\(.*\)#https://\1#p' /run/secrets/codeartifact-pip-conf | head -1)"; \
47-
export UV_INDEX_SCALE_PYPI_USERNAME=aws; \
48-
export UV_INDEX_SCALE_PYPI_PASSWORD="$(sed -n 's#.*index-url = https://aws:\([^@]*\)@.*#\1#p' /run/secrets/codeartifact-pip-conf \
49-
| python3 -c 'import sys,urllib.parse;print(urllib.parse.unquote(sys.stdin.read().strip()))')"; \
50-
fi; \
5138
uv sync --no-install-project --no-dev
5239

5340
# Copy the project code
5441
COPY {{ project_path_from_build_root }}/project ./project
5542

5643
# Install the project
5744
RUN --mount=type=cache,target=/root/.cache/uv \
58-
--mount=type=secret,id=codeartifact-pip-conf,required=false \
59-
if [ -s /run/secrets/codeartifact-pip-conf ]; then \
60-
export UV_INDEX="scale-pypi=$(sed -n 's#.*index-url = https://aws:[^@]*@\(.*\)#https://\1#p' /run/secrets/codeartifact-pip-conf | head -1)"; \
61-
export UV_INDEX_SCALE_PYPI_USERNAME=aws; \
62-
export UV_INDEX_SCALE_PYPI_PASSWORD="$(sed -n 's#.*index-url = https://aws:\([^@]*\)@.*#\1#p' /run/secrets/codeartifact-pip-conf \
63-
| python3 -c 'import sys,urllib.parse;print(urllib.parse.unquote(sys.stdin.read().strip()))')"; \
64-
fi; \
6545
uv sync --no-dev
6646

6747
ENV PATH="/app/{{ project_path_from_build_root }}/.venv/bin:$PATH"

‎src/agentex/lib/cli/templates/default-claude-code/Dockerfile.j2‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,8 @@ COPY {{ project_path_from_build_root }}/requirements.txt /app/{{ project_path_fr
3333

3434
WORKDIR /app/{{ project_path_from_build_root }}
3535

36-
# Optional private index for Scale-internal packages such as sgp-obs, injected by the
37-
# control-plane broker (SGPINF-1568). Inert unless the secret is present.
38-
#
39-
# This variant installs from requirements.txt, so there is no pyproject.toml for uv to
40-
# read a named index out of; the credentialed URL is used directly and is deliberately
41-
# NOT decoded. See PRIVATE_INDEX.md in the agentex-sdk CLI templates directory.
42-
#
4336
# Install the required Python packages
44-
RUN --mount=type=secret,id=codeartifact-pip-conf,required=false \
45-
if [ -s /run/secrets/codeartifact-pip-conf ]; then \
46-
export UV_DEFAULT_INDEX="$(sed -n 's#^[[:space:]]*index-url[[:space:]]*=[[:space:]]*##p' /run/secrets/codeartifact-pip-conf | head -1)"; \
47-
fi; \
48-
uv pip install --system -r requirements.txt
37+
RUN uv pip install --system -r requirements.txt
4938

5039
# Copy the project code
5140
COPY {{ project_path_from_build_root }}/project /app/{{ project_path_from_build_root }}/project

‎src/agentex/lib/cli/templates/default-codex/Dockerfile-uv.j2‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,34 +34,14 @@ WORKDIR /app/{{ project_path_from_build_root }}
3434
COPY {{ project_path_from_build_root }}/pyproject.toml ./
3535

3636
# Install dependencies (without project itself, for layer caching)
37-
# Optional private index for Scale-internal packages such as sgp-obs, injected by the
38-
# control-plane broker (SGPINF-1568). Inert unless the secret is present, so local
39-
# builds, CI builds, and agents that never opt in are unaffected.
40-
#
41-
# To opt in, and for why UV_INDEX is pinned to the broker's URL rather than trusting
42-
# the project's, see PRIVATE_INDEX.md in the agentex-sdk CLI templates directory.
4337
RUN --mount=type=cache,target=/root/.cache/uv \
44-
--mount=type=secret,id=codeartifact-pip-conf,required=false \
45-
if [ -s /run/secrets/codeartifact-pip-conf ]; then \
46-
export UV_INDEX="scale-pypi=$(sed -n 's#.*index-url = https://aws:[^@]*@\(.*\)#https://\1#p' /run/secrets/codeartifact-pip-conf | head -1)"; \
47-
export UV_INDEX_SCALE_PYPI_USERNAME=aws; \
48-
export UV_INDEX_SCALE_PYPI_PASSWORD="$(sed -n 's#.*index-url = https://aws:\([^@]*\)@.*#\1#p' /run/secrets/codeartifact-pip-conf \
49-
| python3 -c 'import sys,urllib.parse;print(urllib.parse.unquote(sys.stdin.read().strip()))')"; \
50-
fi; \
5138
uv sync --no-install-project --no-dev
5239

5340
# Copy the project code
5441
COPY {{ project_path_from_build_root }}/project ./project
5542

5643
# Install the project
5744
RUN --mount=type=cache,target=/root/.cache/uv \
58-
--mount=type=secret,id=codeartifact-pip-conf,required=false \
59-
if [ -s /run/secrets/codeartifact-pip-conf ]; then \
60-
export UV_INDEX="scale-pypi=$(sed -n 's#.*index-url = https://aws:[^@]*@\(.*\)#https://\1#p' /run/secrets/codeartifact-pip-conf | head -1)"; \
61-
export UV_INDEX_SCALE_PYPI_USERNAME=aws; \
62-
export UV_INDEX_SCALE_PYPI_PASSWORD="$(sed -n 's#.*index-url = https://aws:\([^@]*\)@.*#\1#p' /run/secrets/codeartifact-pip-conf \
63-
| python3 -c 'import sys,urllib.parse;print(urllib.parse.unquote(sys.stdin.read().strip()))')"; \
64-
fi; \
6545
uv sync --no-dev
6646

6747
ENV PATH="/app/{{ project_path_from_build_root }}/.venv/bin:$PATH"

‎src/agentex/lib/cli/templates/default-codex/Dockerfile.j2‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,8 @@ COPY {{ project_path_from_build_root }}/requirements.txt /app/{{ project_path_fr
3333

3434
WORKDIR /app/{{ project_path_from_build_root }}
3535

36-
# Optional private index for Scale-internal packages such as sgp-obs, injected by the
37-
# control-plane broker (SGPINF-1568). Inert unless the secret is present.
38-
#
39-
# This variant installs from requirements.txt, so there is no pyproject.toml for uv to
40-
# read a named index out of; the credentialed URL is used directly and is deliberately
41-
# NOT decoded. See PRIVATE_INDEX.md in the agentex-sdk CLI templates directory.
42-
#
4336
# Install the required Python packages
44-
RUN --mount=type=secret,id=codeartifact-pip-conf,required=false \
45-
if [ -s /run/secrets/codeartifact-pip-conf ]; then \
46-
export UV_DEFAULT_INDEX="$(sed -n 's#^[[:space:]]*index-url[[:space:]]*=[[:space:]]*##p' /run/secrets/codeartifact-pip-conf | head -1)"; \
47-
fi; \
48-
uv pip install --system -r requirements.txt
37+
RUN uv pip install --system -r requirements.txt
4938

5039
# Copy the project code
5140
COPY {{ project_path_from_build_root }}/project /app/{{ project_path_from_build_root }}/project

‎src/agentex/lib/cli/templates/default-langgraph/Dockerfile-uv.j2‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,34 +30,14 @@ WORKDIR /app/{{ project_path_from_build_root }}
3030
COPY {{ project_path_from_build_root }}/pyproject.toml ./
3131

3232
# Install dependencies (without project itself, for layer caching)
33-
# Optional private index for Scale-internal packages such as sgp-obs, injected by the
34-
# control-plane broker (SGPINF-1568). Inert unless the secret is present, so local
35-
# builds, CI builds, and agents that never opt in are unaffected.
36-
#
37-
# To opt in, and for why UV_INDEX is pinned to the broker's URL rather than trusting
38-
# the project's, see PRIVATE_INDEX.md in the agentex-sdk CLI templates directory.
3933
RUN --mount=type=cache,target=/root/.cache/uv \
40-
--mount=type=secret,id=codeartifact-pip-conf,required=false \
41-
if [ -s /run/secrets/codeartifact-pip-conf ]; then \
42-
export UV_INDEX="scale-pypi=$(sed -n 's#.*index-url = https://aws:[^@]*@\(.*\)#https://\1#p' /run/secrets/codeartifact-pip-conf | head -1)"; \
43-
export UV_INDEX_SCALE_PYPI_USERNAME=aws; \
44-
export UV_INDEX_SCALE_PYPI_PASSWORD="$(sed -n 's#.*index-url = https://aws:\([^@]*\)@.*#\1#p' /run/secrets/codeartifact-pip-conf \
45-
| python3 -c 'import sys,urllib.parse;print(urllib.parse.unquote(sys.stdin.read().strip()))')"; \
46-
fi; \
4734
uv sync --no-install-project --no-dev
4835

4936
# Copy the project code
5037
COPY {{ project_path_from_build_root }}/project ./project
5138

5239
# Install the project
5340
RUN --mount=type=cache,target=/root/.cache/uv \
54-
--mount=type=secret,id=codeartifact-pip-conf,required=false \
55-
if [ -s /run/secrets/codeartifact-pip-conf ]; then \
56-
export UV_INDEX="scale-pypi=$(sed -n 's#.*index-url = https://aws:[^@]*@\(.*\)#https://\1#p' /run/secrets/codeartifact-pip-conf | head -1)"; \
57-
export UV_INDEX_SCALE_PYPI_USERNAME=aws; \
58-
export UV_INDEX_SCALE_PYPI_PASSWORD="$(sed -n 's#.*index-url = https://aws:\([^@]*\)@.*#\1#p' /run/secrets/codeartifact-pip-conf \
59-
| python3 -c 'import sys,urllib.parse;print(urllib.parse.unquote(sys.stdin.read().strip()))')"; \
60-
fi; \
6141
uv sync --no-dev
6242

6343
ENV PATH="/app/{{ project_path_from_build_root }}/.venv/bin:$PATH"

‎src/agentex/lib/cli/templates/default-langgraph/Dockerfile.j2‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,8 @@ COPY {{ project_path_from_build_root }}/requirements.txt /app/{{ project_path_fr
2929

3030
WORKDIR /app/{{ project_path_from_build_root }}
3131

32-
# Optional private index for Scale-internal packages such as sgp-obs, injected by the
33-
# control-plane broker (SGPINF-1568). Inert unless the secret is present.
34-
#
35-
# This variant installs from requirements.txt, so there is no pyproject.toml for uv to
36-
# read a named index out of; the credentialed URL is used directly and is deliberately
37-
# NOT decoded. See PRIVATE_INDEX.md in the agentex-sdk CLI templates directory.
38-
#
3932
# Install the required Python packages
40-
RUN --mount=type=secret,id=codeartifact-pip-conf,required=false \
41-
if [ -s /run/secrets/codeartifact-pip-conf ]; then \
42-
export UV_DEFAULT_INDEX="$(sed -n 's#^[[:space:]]*index-url[[:space:]]*=[[:space:]]*##p' /run/secrets/codeartifact-pip-conf | head -1)"; \
43-
fi; \
44-
uv pip install --system -r requirements.txt
33+
RUN uv pip install --system -r requirements.txt
4534

4635
# Copy the project code
4736
COPY {{ project_path_from_build_root }}/project /app/{{ project_path_from_build_root }}/project

‎src/agentex/lib/cli/templates/default-openai-agents/Dockerfile-uv.j2‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,34 +30,14 @@ WORKDIR /app/{{ project_path_from_build_root }}
3030
COPY {{ project_path_from_build_root }}/pyproject.toml ./
3131

3232
# Install dependencies (without project itself, for layer caching)
33-
# Optional private index for Scale-internal packages such as sgp-obs, injected by the
34-
# control-plane broker (SGPINF-1568). Inert unless the secret is present, so local
35-
# builds, CI builds, and agents that never opt in are unaffected.
36-
#
37-
# To opt in, and for why UV_INDEX is pinned to the broker's URL rather than trusting
38-
# the project's, see PRIVATE_INDEX.md in the agentex-sdk CLI templates directory.
3933
RUN --mount=type=cache,target=/root/.cache/uv \
40-
--mount=type=secret,id=codeartifact-pip-conf,required=false \
41-
if [ -s /run/secrets/codeartifact-pip-conf ]; then \
42-
export UV_INDEX="scale-pypi=$(sed -n 's#.*index-url = https://aws:[^@]*@\(.*\)#https://\1#p' /run/secrets/codeartifact-pip-conf | head -1)"; \
43-
export UV_INDEX_SCALE_PYPI_USERNAME=aws; \
44-
export UV_INDEX_SCALE_PYPI_PASSWORD="$(sed -n 's#.*index-url = https://aws:\([^@]*\)@.*#\1#p' /run/secrets/codeartifact-pip-conf \
45-
| python3 -c 'import sys,urllib.parse;print(urllib.parse.unquote(sys.stdin.read().strip()))')"; \
46-
fi; \
4734
uv sync --no-install-project --no-dev
4835

4936
# Copy the project code
5037
COPY {{ project_path_from_build_root }}/project ./project
5138

5239
# Install the project
5340
RUN --mount=type=cache,target=/root/.cache/uv \
54-
--mount=type=secret,id=codeartifact-pip-conf,required=false \
55-
if [ -s /run/secrets/codeartifact-pip-conf ]; then \
56-
export UV_INDEX="scale-pypi=$(sed -n 's#.*index-url = https://aws:[^@]*@\(.*\)#https://\1#p' /run/secrets/codeartifact-pip-conf | head -1)"; \
57-
export UV_INDEX_SCALE_PYPI_USERNAME=aws; \
58-
export UV_INDEX_SCALE_PYPI_PASSWORD="$(sed -n 's#.*index-url = https://aws:\([^@]*\)@.*#\1#p' /run/secrets/codeartifact-pip-conf \
59-
| python3 -c 'import sys,urllib.parse;print(urllib.parse.unquote(sys.stdin.read().strip()))')"; \
60-
fi; \
6141
uv sync --no-dev
6242

6343
ENV PATH="/app/{{ project_path_from_build_root }}/.venv/bin:$PATH"

‎src/agentex/lib/cli/templates/default-openai-agents/Dockerfile.j2‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,8 @@ COPY {{ project_path_from_build_root }}/requirements.txt /app/{{ project_path_fr
2929

3030
WORKDIR /app/{{ project_path_from_build_root }}
3131

32-
# Optional private index for Scale-internal packages such as sgp-obs, injected by the
33-
# control-plane broker (SGPINF-1568). Inert unless the secret is present.
34-
#
35-
# This variant installs from requirements.txt, so there is no pyproject.toml for uv to
36-
# read a named index out of; the credentialed URL is used directly and is deliberately
37-
# NOT decoded. See PRIVATE_INDEX.md in the agentex-sdk CLI templates directory.
38-
#
3932
# Install the required Python packages
40-
RUN --mount=type=secret,id=codeartifact-pip-conf,required=false \
41-
if [ -s /run/secrets/codeartifact-pip-conf ]; then \
42-
export UV_DEFAULT_INDEX="$(sed -n 's#^[[:space:]]*index-url[[:space:]]*=[[:space:]]*##p' /run/secrets/codeartifact-pip-conf | head -1)"; \
43-
fi; \
44-
uv pip install --system -r requirements.txt
33+
RUN uv pip install --system -r requirements.txt
4534

4635
# Copy the project code
4736
COPY {{ project_path_from_build_root }}/project /app/{{ project_path_from_build_root }}/project

0 commit comments

Comments
 (0)