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
4 changes: 2 additions & 2 deletions common/config/rush/command-line.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@
"name": "update-api",
"commandKind": "global",
"summary": "⭐️ Update api-schema",
"shellCommand": "pushd frontend/packages/cozeloop/api-schema && npm run update && popd"
"shellCommand": "pushd frontend/packages/loop-base/api-schema && npm run update && popd"
},
{
"name": "update-i18n-types",
"commandKind": "global",
"summary": "⭐️ Update I18n types",
"shellCommand": "pushd frontend/packages/cozeloop/i18n && npm run gen-i18n-types && popd"
"shellCommand": "pushd frontend/packages/loop-base/i18n && npm run gen-i18n-types && popd"
}
],
"parameters": [
Expand Down
2 changes: 1 addition & 1 deletion common/config/rush/pnpm-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"tailwindcss@3.3.6>postcss": "8.4.49",
"@types/react": "18.2.37",
"@types/react-dom": "18.2.15",
"@coze-arch/coze-design": "0.0.7-alpha.985c0d",
"@coze-arch/coze-design": "0.0.7-alpha.5f0418",
"typescript": "5.8.2"
},
"globalPeerDependencyRules": {},
Expand Down
2 changes: 1 addition & 1 deletion common/config/subspaces/default/common-versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/common-versions.schema.json",
"ensureConsistentVersions": true,
"preferredVersions": {
"@coze-arch/coze-design": "0.0.7-alpha.985c0d"
"@coze-arch/coze-design": "0.0.7-alpha.5f0418"
},
"allowedAlternativeVersions": {
"@rspack/cli": ["0.6.0"],
Expand Down
5 changes: 2 additions & 3 deletions common/config/subspaces/default/pnpm-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}
},
"globalOverrides": {
"@coze-arch/coze-design": "0.0.7-alpha.985c0d",
"@coze-arch/coze-design": "0.0.7-alpha.5f0418",
"sass@1.74.1>immutable": "3.8.2",
"web-streams-polyfill": "3.3.2",
"vitest@1.4.0>vite": "5.1.6",
Expand Down Expand Up @@ -39,8 +39,7 @@
"globalAllowedDeprecatedVersions": {},
"globalPatchedDependencies": {
"web-streams-polyfill@3.3.2": "patches/web-streams-polyfill@3.3.2.patch",
"ahooks@3.7.8": "patches/ahooks@3.7.8.patch",
"@douyinfe/semi-rspack-plugin@2.61.0": "patches/@douyinfe__semi-rspack-plugin@2.61.0.patch"
"ahooks@3.7.8": "patches/ahooks@3.7.8.patch"
},
"unsupportedPackageJsonSettings": {}
}
541 changes: 453 additions & 88 deletions common/config/subspaces/default/pnpm-lock.yaml

Large diffs are not rendered by default.

This file was deleted.

2 changes: 1 addition & 1 deletion common/config/subspaces/default/repo-state.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.
{
"preferredVersionsHash": "952e3e1a65c3a8705213d584aa5dcb7365b57a96"
"preferredVersionsHash": "61f90e34233c887b4e5616946ade4dc6524e57bd"
}
2 changes: 1 addition & 1 deletion frontend/apps/cozeloop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"dependencies": {
"@coze-arch/bot-flags": "workspace:*",
"@coze-arch/bot-md-box-adapter": "workspace:*",
"@coze-arch/coze-design": "0.0.7-alpha.985c0d",
"@coze-arch/coze-design": "0.0.7-alpha.5f0418",
"@coze-arch/logger": "workspace:*",
"@cozeloop/account": "workspace:*",
"@cozeloop/api-schema": "workspace:*",
Expand Down
2 changes: 0 additions & 2 deletions frontend/packages/loop-base/bot-env-adapter/src/typings.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// Copyright (c) 2025 coze-dev Authors
// SPDX-License-Identifier: Apache-2.0
/* eslint-disable */
/* prettier-ignore */
// 基于src/index.ts自动生成,请勿手动修改
Expand Down
3 changes: 1 addition & 2 deletions frontend/packages/loop-base/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@codemirror/commands": "^6.3.3",
"@codemirror/state": "^6.4.1",
"@codemirror/view": "^6.34.1",
"@coze-arch/coze-design": "0.0.7-alpha.985c0d",
"@coze-arch/coze-design": "0.0.7-alpha.5f0418",
"@coze-editor/editor": "0.1.0-alpha.dac011",
"@cozeloop/api-schema": "workspace:*",
"@cozeloop/hooks": "workspace:*",
Expand Down Expand Up @@ -54,4 +54,3 @@
},
"peerDependencies": {}
}

4 changes: 4 additions & 0 deletions frontend/packages/loop-base/i18n/src/locale-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3981,6 +3981,10 @@ if __name__ == "__main__":
(key: 'fornax_analytics_week', fallbackText?: string): string;
/** 全部模型 */
(key: 'model_all_models', fallbackText?: string): string;
/** 且 */
(key: 'fornax_components_logic_expr_and', fallbackText?: string): string;
/** 或 */
(key: 'fornax_components_logic_expr_or', fallbackText?: string): string;
/** 全部工具 */
(key: 'observation_all_tools', fallbackText?: string): string;
/** 模型 QPS | QPM */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"test:cov": "npm run test -- --coverage"
},
"dependencies": {
"@coze-arch/coze-design": "0.0.7-alpha.985c0d",
"@coze-arch/coze-design": "0.0.7-alpha.5f0418",
"@cozeloop/api-schema": "workspace:*",
"@cozeloop/biz-hooks-adapter": "workspace:*",
"@cozeloop/components": "workspace:*",
Expand Down Expand Up @@ -41,4 +41,3 @@
"react-dom": ">=18.2.0"
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"test:cov": "exit 0"
},
"dependencies": {
"@coze-arch/coze-design": "0.0.7-alpha.985c0d",
"@coze-arch/coze-design": "0.0.7-alpha.5f0418",
"@cozeloop/biz-hooks-adapter": "workspace:*",
"@cozeloop/i18n-adapter": "workspace:*"
},
Expand All @@ -36,4 +36,3 @@
},
"peerDependencies": {}
}

Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"test:cov": "npm run test -- --coverage"
},
"dependencies": {
"@coze-arch/coze-design": "0.0.7-alpha.985c0d",
"@coze-arch/coze-design": "0.0.7-alpha.5f0418",
"@cozeloop/adapter-interfaces": "workspace:*",
"@cozeloop/api-schema": "workspace:*",
"@cozeloop/biz-hooks-adapter": "workspace:*",
Expand Down Expand Up @@ -59,4 +59,3 @@
"react": ">=18.2.0"
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"dependencies": {
"@coze-arch/bot-md-box-adapter": "workspace:*",
"@coze-arch/coze-design": "0.0.7-alpha.985c0d",
"@coze-arch/coze-design": "0.0.7-alpha.5f0418",
"@cozeloop/adapter-interfaces": "workspace:*",
"@cozeloop/api-schema": "workspace:*",
"@cozeloop/base-with-adapter-components": "workspace:*",
Expand Down Expand Up @@ -95,4 +95,3 @@
"react-router-dom": "^6.22.0"
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ export const useDatasetColumnEdit = ({
}}
>
{({ formState }) => {
const { columns } = formState.values;
const { columns } = formState.values ?? {};
return (
<div
className="w-full flex h-full py-[16px] pl-[24px] pr-[18px] overflow-y-auto styled-scrollbar gap-[16px]"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"test:cov": "npm run test -- --coverage"
},
"dependencies": {
"@coze-arch/coze-design": "0.0.7-alpha.985c0d",
"@coze-arch/coze-design": "0.0.7-alpha.5f0418",
"@cozeloop/adapter-interfaces": "workspace:*",
"@cozeloop/api-schema": "workspace:*",
"@cozeloop/biz-hooks-adapter": "workspace:*",
Expand Down Expand Up @@ -53,4 +53,3 @@
"react-router-dom": "^6.22.0"
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"test:cov": "npm run test -- --coverage"
},
"dependencies": {
"@coze-arch/coze-design": "0.0.7-alpha.985c0d",
"@coze-arch/coze-design": "0.0.7-alpha.5f0418",
"@cozeloop/api-schema": "workspace:*",
"@cozeloop/components": "workspace:*",
"@textea/json-viewer": "^3.0.0",
Expand Down Expand Up @@ -80,7 +80,7 @@
"@coze-arch/vitest-config": "workspace:*",
"@cozeloop/tailwind-config": "workspace:*",
"@cozeloop/tailwind-plugin": "workspace:*",
"@douyinfe/semi-rspack-plugin": "2.61.0",
"@douyinfe/semi-rspack-plugin": "2.90.10",
"@microsoft/rush-lib": "~5.147.1",
"@rsbuild/core": "~1.1.0",
"@rsbuild/plugin-less": "~1.1.0",
Expand Down Expand Up @@ -150,4 +150,3 @@
}
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@codemirror/search": "^6.5.5",
"@codemirror/state": "^6.4.1",
"@codemirror/view": "^6.34.1",
"@coze-arch/coze-design": "0.0.7-alpha.985c0d",
"@coze-arch/coze-design": "0.0.7-alpha.5f0418",
"@coze-arch/fetch-stream": "workspace:*",
"@coze-editor/editor": "0.1.0-alpha.dac011",
"@coze-editor/extension-regexp-decorator": "0.1.0-alpha.0fd19e",
Expand Down Expand Up @@ -70,4 +70,3 @@
},
"peerDependencies": {}
}

Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ export function VariableModal({
labelPosition="top"
>
{({ formState }) => {
const { type } = formState.values;
const { type } = formState.values ?? {};
const isJson =
type?.includes('array') || type === VariableType.Object;
return (
Expand Down Expand Up @@ -456,7 +456,7 @@ export function VariableModal({
className={'!text-[13px]'}
link
onClick={() => {
const json = safeJsonParse(formState.values.value);
const json = safeJsonParse(formState.values?.value);
if (json) {
formApiRef.current?.setValue(
'value',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@codemirror/state": "^6.4.1",
"@codemirror/view": "^6.34.1",
"@coze-arch/bot-md-box-adapter": "workspace:*",
"@coze-arch/coze-design": "0.0.7-alpha.985c0d",
"@coze-arch/coze-design": "0.0.7-alpha.5f0418",
"@coze-arch/fetch-stream": "workspace:*",
"@coze-editor/editor": "0.1.0-alpha.dac011",
"@coze-editor/extension-regexp-decorator": "0.1.0-alpha.0fd19e",
Expand Down Expand Up @@ -67,4 +67,3 @@
},
"peerDependencies": {}
}

Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test:cov": "npm run test -- --coverage"
},
"dependencies": {
"@coze-arch/coze-design": "0.0.7-alpha.985c0d",
"@coze-arch/coze-design": "0.0.7-alpha.5f0418",
"@cozeloop/api-schema": "workspace:*",
"@cozeloop/guard": "workspace:*",
"@cozeloop/i18n-adapter": "workspace:*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"test:cov": "npm run test -- --coverage"
},
"dependencies": {
"@coze-arch/coze-design": "0.0.7-alpha.985c0d",
"@coze-arch/coze-design": "0.0.7-alpha.5f0418",
"@coze-arch/logger": "workspace:*",
"@cozeloop/api-schema": "workspace:*",
"@cozeloop/biz-components-adapter": "workspace:*",
Expand Down Expand Up @@ -60,4 +60,3 @@
"react-router-dom": "^6.22.0"
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,15 @@ export const AnnotationContent = (props: AnnotationContentProps) => {
<div className="text-xxl font-semibold leading-6 text-[var(--coz-fg-plus)] mb-4 flex items-center gap-x-[6px]">
{I18n.t('tag_list')}
<span className="text-[12px] font-semibold leading-4 text-[var(--coz-fg-dim)]">
{formState.values.tags?.length ?? 0} / 50
{formState.values?.tags?.length ?? 0} / 50
</span>
</div>
<ArrayField field="tags">
{({ arrayFields, add }) => (
<div>
{arrayFields.map(({ field, remove, key }, index) => {
const tagItem = formState.values.tags?.[index];
const disableSelectList = formState.values.tags?.map(
const tagItem = formState.values?.tags?.[index];
const disableSelectList = formState.values?.tags?.map(
item => item.tagInfo?.tag_key_id ?? '',
);
return (
Expand Down Expand Up @@ -155,7 +155,7 @@ export const AnnotationContent = (props: AnnotationContentProps) => {
onCreateAnnotationSuccess={(_value, annotationId) => {
if (tagItem) {
tagItem.isRemoteValue = true;
if (annotationId) {
if (annotationId && tagItem.annotation) {
tagItem.annotation.id = annotationId;
}
}
Expand All @@ -167,11 +167,12 @@ export const AnnotationContent = (props: AnnotationContentProps) => {
onTagSelectChange={(v, extraInfo) => {
const { value, label, ...tagInfo } = v as any;

const isCreateNewTag = !formState.values.tags?.some(
item =>
item.tagInfo?.tag_key_id ===
extraInfo?.tag_key_id,
);
const isCreateNewTag =
!formState.values?.tags?.some(
item =>
item.tagInfo?.tag_key_id ===
extraInfo?.tag_key_id,
);

if (isCreateNewTag) {
formApi.setValue(
Expand All @@ -194,7 +195,8 @@ export const AnnotationContent = (props: AnnotationContentProps) => {
annotation_key:
tagItem?.annotation?.key ??
tagItem?.annotation?.manual_feedback
?.tag_key_id,
?.tag_key_id ??
'',
platform_type: platformType as PlatformType,
});
}
Expand Down Expand Up @@ -222,13 +224,14 @@ export const AnnotationContent = (props: AnnotationContentProps) => {
/>

<AnnotationRemoveButton
annotation_id={tagItem?.annotation?.id}
annotation_id={tagItem?.annotation?.id ?? ''}
span_id={span.span_id}
start_time={span.started_at}
trace_id={span.trace_id}
annotation_key={
tagItem?.annotation?.key ??
tagItem?.annotation?.manual_feedback?.tag_key_id
tagItem?.annotation?.manual_feedback?.tag_key_id ??
''
}
onClick={() => remove()}
isRemoteItem={tagItem?.isRemoteValue ?? false}
Expand All @@ -240,7 +243,7 @@ export const AnnotationContent = (props: AnnotationContentProps) => {
<AnnotationAddButton
onAdd={add}
disabled={
(formState.values.tags?.length ?? 0) >= MAX_TAG_LENGTH
(formState.values?.tags?.length ?? 0) >= MAX_TAG_LENGTH
}
/>
</div>
Expand Down
Loading
Loading