Merge pull request #189 from APIParkLab/feature/openapi

update workflows actions/download-artifact to v4

.github/workflows/release.yaml

@@ -25,7 +25,7 @@ jobs:
           echo "Build frontend..."
           cd ./frontend && pnpm run build
       - name: upload frontend release
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: frontend-package
           path: frontend/dist
@@ -41,7 +41,7 @@ jobs:
       - name: Checkout  #Checkout代码
         uses: actions/checkout@v3
       - name: download frontend release
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: frontend-package
           path: frontend/dist
@@ -71,7 +71,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: download frontend release
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: frontend-package
           path: frontend/dist

frontend/packages/core/src/pages/aiSetting/components/KeyStatusNode.tsx

@@ -27,6 +27,7 @@ export const KeyStatusNode: React.FC<{ data: KeyStatusNodeData }> = ({ data }) =
         <div
           className="flex gap-1 w-full"
           style={{
+            minWidth: keys.length > 5 ? '118px' : 'auto',
             maxWidth: `calc(${MAX_KEYS} * ${KEY_SIZE} + (${MAX_KEYS} - 1) * ${KEY_GAP})`,
             minHeight: KEY_SIZE
           }}

frontend/packages/core/src/pages/aiSetting/components/ModelCardNode.tsx

@@ -29,46 +29,48 @@ export const ModelCardNode: React.FC<{ data: ModelCardNodeData }> = ({ data }) =
   const statusConfig = getStatusIcon(status)
 
   return (
-    <div
-      className="node-card bg-white rounded-lg shadow-sm p-4 min-w-[280px] group"
-      style={{ border: '1px solid var(--border-color)' }}
-    >
-      <Handle type="target" position={Position.Left} />
-      <Handle type="source" position={Position.Right} />
-      <div>
-        <div className="flex justify-between items-center">
-          <div className="flex gap-2 items-center">
-            <div className="flex flex-1 overflow-hidden items-center gap-[4px]">
-              <span
-                className="flex items-center h-[22px] ai-setting-svg-container"
-                dangerouslySetInnerHTML={{ __html: logo }}
-              ></span>
+    <>
+      <div
+        className="node-card bg-white rounded-lg shadow-sm p-4 min-w-[280px] group"
+        style={{ border: '1px solid var(--border-color)' }}
+      >
+        <Handle type="target" position={Position.Left} />
+        <Handle type="source" position={Position.Right} />
+        <div>
+          <div className="flex justify-between items-center">
+            <div className="flex gap-2 items-center">
+              <div className="flex flex-1 overflow-hidden items-center gap-[4px]">
+                <span
+                  className="flex items-center h-[22px] ai-setting-svg-container"
+                  dangerouslySetInnerHTML={{ __html: logo }}
+                ></span>
+              </div>
+              <span className="text-base text-gray-900 max-w-[180px] truncate">{name}</span>
+              <Icon icon={statusConfig?.icon} className={`text-xl ${statusConfig?.color}`} />
             </div>
-            <span className="text-base text-gray-900 max-w-[180px] truncate">{name}</span>
-            <Icon icon={statusConfig?.icon} className={`text-xl ${statusConfig?.color}`} />
-          </div>
 
-          {/* Action buttons */}
-          <div className="flex gap-2 transition-opacity duration-200">
-            <Icon
-              icon="mdi:cog"
-              className="text-xl text-gray-400 cursor-pointer hover:text-[--primary-color]"
-              onClick={() => {
-                openConfigModal({ id: data.id, defaultLlm: defaultLlm } as AiSettingListItem)
-              }}
-            />
+            {/* Action buttons */}
+            <div className="flex gap-2 transition-opacity duration-200">
+              <Icon
+                icon="mdi:cog"
+                className="text-xl text-gray-400 cursor-pointer hover:text-[--primary-color]"
+                onClick={() => {
+                  openConfigModal({ id: data.id, defaultLlm: defaultLlm } as AiSettingListItem)
+                }}
+              />
+            </div>
+          </div>
+          <div className="mt-2 text-sm text-gray-500">
+            {$t('默认：')}
+            {defaultLlm}
           </div>
         </div>
-        <div className="mt-2 text-sm text-gray-500">
-          {$t('默认：')}
-          {defaultLlm}
-        </div>
-        {status !== 'enabled' && alternativeModel && (
-          <div className="mt-1 text-sm text-gray-500">
-            {$t('关联 API 已转用')} {alternativeModel.name}/{alternativeModel.defaultLlm}
-          </div>
-        )}
       </div>
-    </div>
+          {status !== 'enabled' && alternativeModel && (
+            <div className="ml-4 mt-1 text-sm text-gray-500">
+              {$t('关联 API 已转用')} {alternativeModel.name}/{alternativeModel.defaultLlm}
+            </div>
+          )}
+    </>
   )
 }

frontend/packages/core/src/pages/aiSetting/styles.css

@@ -18,11 +18,15 @@
 .react-flow__node {
   padding: 0;
   border-radius: 8px;
-  min-width: 150px;
   width: auto;
   max-width: 100%;
 }
 
+.react-flow__node-modelCard,
+.react-flow__node-serviceCard {
+  min-width: 150px;
+}
+
 /* Custom Node Styles */
 .custom-node {
   background: white;

module/ai/iml.go

@@ -535,15 +535,15 @@ func (i *imlProviderModule) UpdateProviderConfig(ctx context.Context, id string,
 			Priority:   input.Priority,
 			Status:     &status,
 		}
-		_, err = i.aiKeyService.DefaultKey(ctx, id)
+		_, err = i.aiKeyService.DefaultKey(txCtx, id)
 		if err != nil {
 			if !errors.Is(err, gorm.ErrRecordNotFound) {
 				return err
 			}
-			err = i.aiKeyService.Create(ctx, &ai_key.Create{
+			err = i.aiKeyService.Create(txCtx, &ai_key.Create{
 				ID:         id,
 				Name:       info.Name,
-				Config:     info.Config,
+				Config:     input.Config,
 				Provider:   id,
 				Status:     1,
 				ExpireTime: 0,
@@ -551,28 +551,21 @@ func (i *imlProviderModule) UpdateProviderConfig(ctx context.Context, id string,
 				Priority:   1,
 			})
 		} else {
-			err = i.aiKeyService.Save(ctx, id, &ai_key.Edit{
-				Config: &info.Config,
+			err = i.aiKeyService.Save(txCtx, id, &ai_key.Edit{
+				Config: &input.Config,
+				Status: &status,
 			})
 		}
 		if err != nil {
 			return err
 		}
-
-		//if input.Enable != nil {
-		//	status = 0
-		//	if *input.Enable {
-		//		status = 1
-		//	}
-		//	pInfo.Status = &status
-		//}
-		err = i.providerService.Save(ctx, id, pInfo)
+		err = i.providerService.Save(txCtx, id, pInfo)
 		if err != nil {
 			return err
 		}
 
 		if *pInfo.Status == 0 {
-			return i.syncGateway(ctx, cluster.DefaultClusterID, []*gateway.DynamicRelease{
+			return i.syncGateway(txCtx, cluster.DefaultClusterID, []*gateway.DynamicRelease{
 				{
 					BasicItem: &gateway.BasicItem{
 						ID:       id,
@@ -581,8 +574,8 @@ func (i *imlProviderModule) UpdateProviderConfig(ctx context.Context, id string,
 				},
 			}, false)
 		}
-		// 获取当前供应商所有Key信息
-		defaultKey, err := i.aiKeyService.DefaultKey(ctx, id)
+		// 获取当前供应商默认Key信息
+		defaultKey, err := i.aiKeyService.DefaultKey(txCtx, id)
 		if err != nil {
 			return err
 		}
@@ -592,7 +585,7 @@ func (i *imlProviderModule) UpdateProviderConfig(ctx context.Context, id string,
 		cfg["model_config"] = model.DefaultConfig()
 		cfg["priority"] = info.Priority
 		cfg["base"] = fmt.Sprintf("%s://%s", p.URI().Scheme(), p.URI().Host())
-		return i.syncGateway(ctx, cluster.DefaultClusterID, []*gateway.DynamicRelease{
+		return i.syncGateway(txCtx, cluster.DefaultClusterID, []*gateway.DynamicRelease{
 			{
 				BasicItem: &gateway.BasicItem{
 					ID:          id,

module/application-authorization/iml.go

@@ -100,7 +100,8 @@ func (i *imlAuthorizationModule) getApplications(ctx context.Context, appIds []s
 					Config:         authCfg,
 					HideCredential: a.HideCredential,
 					Label: map[string]string{
-						"authorization": a.UUID,
+						"authorization":      a.UUID,
+						"authorization_name": a.Name,
 					},
 				}
 			}),
@@ -157,7 +158,8 @@ func (i *imlAuthorizationModule) online(ctx context.Context, s *service.Service)
 				Config:         authCfg,
 				HideCredential: a.HideCredential,
 				Label: map[string]string{
-					"authorization": a.UUID,
+					"authorization":      a.UUID,
+					"authorization_name": a.Name,
 				},
 			}
 		}),