Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
867 changes: 867 additions & 0 deletions frontend/server/deployment_resources.py

Large diffs are not rendered by default.

129 changes: 124 additions & 5 deletions frontend/src/adk/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -450,14 +450,17 @@ function formatErrorDetail(detail: unknown): string {
}

async function httpErrorMessage(res: Response, fallback: string): Promise<string> {
const context = `${fallback}(HTTP ${res.status})`;
const text = await res.text().catch(() => "");
if (!text) return `${fallback} (${res.status})`;
if (!text) return context;
try {
const data = JSON.parse(text) as { detail?: unknown; error?: unknown };
const detail = formatErrorDetail(data.detail ?? data.error);
return detail || text || `${fallback} (${res.status})`;
return detail
? `${context}\n${detail}\n原始响应:\n${text}`
: `${context}\n原始响应:\n${text}`;
} catch {
return text || `${fallback} (${res.status})`;
return `${context}\n原始响应:\n${text}`;
}
}

Expand Down Expand Up @@ -1825,6 +1828,121 @@ export type DeployAuthentication =
| { type: "api_key" }
| { type: "user_pool"; userPoolUid: string };

export type DeploymentResourceMode = "auto" | "create" | "existing";

export interface DeployResources {
tos: {
mode: DeploymentResourceMode;
bucket?: string;
};
cr: {
mode: DeploymentResourceMode;
instance?: string;
namespace?: string;
repository?: string;
};
codePipeline: {
mode: DeploymentResourceMode;
workspaceId?: string;
workspaceName?: string;
pipelineId?: string;
pipelineName?: string;
};
}

export type DeploymentResourceKind =
| "tos-bucket"
| "cr-registry"
| "cr-namespace"
| "cr-repository"
| "cp-workspace"
| "cp-pipeline";

export interface DeploymentResource {
id: string;
name: string;
region: string;
status: string;
compatible?: boolean;
}

export interface DeploymentResourceQuery {
kind: DeploymentResourceKind;
region: string;
registry?: string;
namespace?: string;
workspaceId?: string;
search?: string;
pageNumber?: number;
pageSize?: number;
}

export async function listDeploymentResources(
query: DeploymentResourceQuery,
signal?: AbortSignal,
): Promise<{
serviceRegion: string;
items: DeploymentResource[];
pageNumber: number;
pageSize: number;
totalCount: number;
hasMore: boolean;
}> {
const params = new URLSearchParams({ kind: query.kind, region: query.region });
if (query.registry) params.set("registry", query.registry);
if (query.namespace) params.set("namespace", query.namespace);
if (query.workspaceId) params.set("workspaceId", query.workspaceId);
if (query.search) params.set("search", query.search);
if (query.pageNumber) params.set("pageNumber", String(query.pageNumber));
if (query.pageSize) params.set("pageSize", String(query.pageSize));
const response = await apiFetch(
`/web/deployment-resources?${params.toString()}`,
{ signal },
);
if (!response.ok) {
throw new Error(await httpErrorMessage(response, "加载云资源失败"));
}
const payload = (await response.json()) as {
serviceRegion?: unknown;
items?: unknown;
pageNumber?: unknown;
pageSize?: unknown;
totalCount?: unknown;
hasMore?: unknown;
};
if (
typeof payload.serviceRegion !== "string" ||
!Array.isArray(payload.items) ||
typeof payload.pageNumber !== "number" ||
typeof payload.pageSize !== "number" ||
typeof payload.totalCount !== "number" ||
typeof payload.hasMore !== "boolean"
) {
throw new Error("云资源列表响应格式无效");
}
const items = payload.items.map((item) => {
if (
!item ||
typeof item !== "object" ||
typeof (item as DeploymentResource).id !== "string" ||
typeof (item as DeploymentResource).name !== "string" ||
typeof (item as DeploymentResource).region !== "string" ||
typeof (item as DeploymentResource).status !== "string"
) {
throw new Error("云资源列表响应格式无效");
}
return item as DeploymentResource;
});
return {
serviceRegion: payload.serviceRegion,
items,
pageNumber: payload.pageNumber,
pageSize: payload.pageSize,
totalCount: payload.totalCount,
hasMore: payload.hasMore,
};
}

export interface IdentityUserPool {
uid: string;
name: string;
Expand Down Expand Up @@ -1930,6 +2048,7 @@ export async function deployAgentkitProject(
};
};
envs?: { key: string; value: string }[];
resources?: DeployResources;
},
): Promise<DeployAgentkitResult> {
const taskId = opts?.taskId;
Expand Down Expand Up @@ -1970,6 +2089,7 @@ export async function deployAgentkitProject(
authentication: opts?.authentication,
im: opts?.im,
envs: opts?.envs,
resources: opts?.resources,
}),
},
{},
Expand Down Expand Up @@ -2391,8 +2511,7 @@ export async function getRuntimes(
const res = await apiFetch(`/web/runtimes?${p.toString()}`);
if (!res.ok) {
const detail = await httpErrorMessage(res, "加载 Runtime 失败");
const summary = `加载 Runtime 失败(HTTP ${res.status})`;
throw new Error(detail === `加载 Runtime 失败 (${res.status})` ? summary : `${summary}:${detail}`);
throw new Error(detail);
}
const d = (await res.json()) as Partial<RuntimePage>;
return { runtimes: d.runtimes ?? [], nextToken: d.nextToken ?? "" };
Expand Down
213 changes: 213 additions & 0 deletions frontend/src/ui/DeploymentResources.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,213 @@
.pp-config-section.pp-resource-section {
overflow: visible;
}

.pp-resource-section:has(.pp-deployment-select-trigger[aria-expanded="true"]) {
position: relative;
z-index: 70;
}

.pp-resource-list {
--pp-resource-mode-column: minmax(196px, 0.34fr);

display: flex;
flex-direction: column;
gap: 12px;
}

.pp-resource-item {
min-width: 0;
padding: 12px;
border: 1px solid hsl(var(--border) / 0.72);
border-radius: 10px;
background: hsl(var(--background));
}

.pp-resource-name {
margin-bottom: 10px;
color: hsl(var(--foreground));
font-size: 13px;
font-weight: 600;
line-height: 1.4;
}

.pp-resource-grid {
min-width: 0;
display: grid;
grid-template-columns: var(--pp-resource-mode-column) minmax(0, 0.66fr);
align-items: start;
gap: 12px;
}

.pp-resource-fields {
min-width: 0;
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
gap: 10px;
}

.pp-resource-fields-three {
grid-template-columns: repeat(3, minmax(0, 1fr));
}

.pp-resource-field {
min-width: 0;
display: flex;
flex-direction: column;
gap: 6px;
color: hsl(var(--muted-foreground));
font-size: 12px;
line-height: 1.4;
}

.pp-resource-field > input {
width: 100%;
min-width: 0;
height: 36px;
box-sizing: border-box;
padding: 0 10px;
border: 1px solid hsl(var(--border));
border-radius: 6px;
outline: none;
background: hsl(var(--background));
color: hsl(var(--foreground));
font: inherit;
font-size: 12.5px;
transition:
border-color 120ms ease,
box-shadow 120ms ease;
}

.pp-resource-field > input:focus-visible {
border-color: hsl(var(--ring) / 0.55);
box-shadow: 0 0 0 2px hsl(var(--ring) / 0.08);
}

.pp-resource-field > input:disabled {
cursor: not-allowed;
opacity: 0.55;
}

.pp-resource-auto-names {
min-width: 0;
display: flex;
flex-direction: column;
gap: 6px;
color: hsl(var(--muted-foreground));
font-size: 12px;
line-height: 1.4;
}

.pp-resource-auto-names > dl {
min-width: 0;
margin: 0;
overflow: hidden;
border: 1px solid hsl(var(--border));
border-radius: 6px;
background: hsl(var(--background));
}

.pp-resource-auto-names > dl > div {
min-width: 0;
min-height: 35px;
display: grid;
grid-template-columns: minmax(88px, 0.34fr) minmax(0, 0.66fr);
align-items: center;
gap: 10px;
padding: 8px 10px;
}

.pp-resource-auto-names > dl > div + div {
border-top: 1px solid hsl(var(--border) / 0.72);
}

.pp-resource-auto-names dt,
.pp-resource-auto-names dd {
min-width: 0;
margin: 0;
}

.pp-resource-auto-names dd {
overflow-wrap: anywhere;
color: hsl(var(--foreground));
font-size: 12.5px;
}

.pp-resource-auto-names > small {
color: hsl(var(--muted-foreground));
font-size: 11.5px;
line-height: 1.45;
}

.pp-resource-picker {
min-width: 0;
display: flex;
flex-direction: column;
gap: 6px;
}

.pp-resource-status {
min-height: 17px;
color: hsl(var(--muted-foreground));
font-size: 11.5px;
line-height: 1.45;
}

.pp-resource-error {
min-height: 17px;
display: flex;
align-items: flex-start;
justify-content: space-between;
gap: 8px;
color: hsl(var(--destructive));
font-size: 11.5px;
line-height: 1.45;
}

.pp-resource-error span {
min-width: 0;
white-space: pre-wrap;
overflow-wrap: anywhere;
}

.pp-resource-error button {
flex-shrink: 0;
padding: 0;
border: 0;
background: transparent;
color: inherit;
cursor: pointer;
font: inherit;
font-weight: 600;
}

.pp-resource-error button:focus-visible {
outline: 2px solid hsl(var(--ring) / 0.45);
outline-offset: 2px;
}

.pp-resource-validation {
margin: 0;
color: hsl(var(--destructive));
font-size: 12px;
line-height: 1.5;
}

@media (max-width: 760px) {
.pp-resource-grid,
.pp-resource-fields,
.pp-resource-fields-three {
grid-template-columns: minmax(0, 1fr);
}

.pp-resource-auto-names > dl > div {
grid-template-columns: minmax(0, 1fr);
gap: 2px;
}
}

@media (prefers-reduced-motion: reduce) {
.pp-resource-field > input {
transition: none;
}
}
Loading
Loading