Merge branch 'support/anybase' of ssh://github.com/apecloud/ApeRAG into support/anybase

Author: iziang

web/src/api/apis/default-api.ts

@@ -62,6 +62,10 @@ import type { Collection } from '../models';
 // @ts-ignore
 import type { CollectionCreate } from '../models';
 // @ts-ignore
+import type { CollectionPublishRequest } from '../models';
+// @ts-ignore
+import type { CollectionSharingStatusResponse } from '../models';
+// @ts-ignore
 import type { CollectionUpdate } from '../models';
 // @ts-ignore
 import type { CollectionViewList } from '../models';
@@ -156,8 +160,6 @@ import type { SharedCollection } from '../models';
 // @ts-ignore
 import type { SharedCollectionList } from '../models';
 // @ts-ignore
-import type { SharingStatusResponse } from '../models';
-// @ts-ignore
 import type { TagFilterRequest } from '../models';
 // @ts-ignore
 import type { TitleGenerateRequest } from '../models';
@@ -1934,15 +1936,18 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati
             };
         },
         /**
-         * Publish a collection to the public marketplace (owner only)
+         * Publish a collection to the marketplace with department scope (owner only)
          * @summary Publish collection to marketplace
          * @param {string} collectionId Collection ID
+         * @param {CollectionPublishRequest} collectionPublishRequest 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        collectionsCollectionIdSharingPost: async (collectionId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+        collectionsCollectionIdSharingPost: async (collectionId: string, collectionPublishRequest: CollectionPublishRequest, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'collectionId' is not null or undefined
             assertParamExists('collectionsCollectionIdSharingPost', 'collectionId', collectionId)
+            // verify required parameter 'collectionPublishRequest' is not null or undefined
+            assertParamExists('collectionsCollectionIdSharingPost', 'collectionPublishRequest', collectionPublishRequest)
             const localVarPath = `/collections/{collection_id}/sharing`
                 .replace(`{${"collection_id"}}`, encodeURIComponent(String(collectionId)));
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
@@ -1962,9 +1967,12 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati
 
 
 
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(collectionPublishRequest, localVarRequestOptions, configuration)
 
             return {
                 url: toPathString(localVarUrlObj),
@@ -4176,21 +4184,22 @@ export const DefaultApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async collectionsCollectionIdSharingGet(collectionId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<SharingStatusResponse>> {
+        async collectionsCollectionIdSharingGet(collectionId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionSharingStatusResponse>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.collectionsCollectionIdSharingGet(collectionId, options);
             const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
             const localVarOperationServerBasePath = operationServerMap['DefaultApi.collectionsCollectionIdSharingGet']?.[localVarOperationServerIndex]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
-         * Publish a collection to the public marketplace (owner only)
+         * Publish a collection to the marketplace with department scope (owner only)
          * @summary Publish collection to marketplace
          * @param {string} collectionId Collection ID
+         * @param {CollectionPublishRequest} collectionPublishRequest 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async collectionsCollectionIdSharingPost(collectionId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.collectionsCollectionIdSharingPost(collectionId, options);
+        async collectionsCollectionIdSharingPost(collectionId: string, collectionPublishRequest: CollectionPublishRequest, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.collectionsCollectionIdSharingPost(collectionId, collectionPublishRequest, options);
             const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
             const localVarOperationServerBasePath = operationServerMap['DefaultApi.collectionsCollectionIdSharingPost']?.[localVarOperationServerIndex]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
@@ -5199,18 +5208,18 @@ export const DefaultApiFactory = function (configuration?: Configuration, basePa
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        collectionsCollectionIdSharingGet(requestParameters: DefaultApiCollectionsCollectionIdSharingGetRequest, options?: RawAxiosRequestConfig): AxiosPromise<SharingStatusResponse> {
+        collectionsCollectionIdSharingGet(requestParameters: DefaultApiCollectionsCollectionIdSharingGetRequest, options?: RawAxiosRequestConfig): AxiosPromise<CollectionSharingStatusResponse> {
             return localVarFp.collectionsCollectionIdSharingGet(requestParameters.collectionId, options).then((request) => request(axios, basePath));
         },
         /**
-         * Publish a collection to the public marketplace (owner only)
+         * Publish a collection to the marketplace with department scope (owner only)
          * @summary Publish collection to marketplace
          * @param {DefaultApiCollectionsCollectionIdSharingPostRequest} requestParameters Request parameters.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
         collectionsCollectionIdSharingPost(requestParameters: DefaultApiCollectionsCollectionIdSharingPostRequest, options?: RawAxiosRequestConfig): AxiosPromise<void> {
-            return localVarFp.collectionsCollectionIdSharingPost(requestParameters.collectionId, options).then((request) => request(axios, basePath));
+            return localVarFp.collectionsCollectionIdSharingPost(requestParameters.collectionId, requestParameters.collectionPublishRequest, options).then((request) => request(axios, basePath));
         },
         /**
          * Trigger collection summary generation as background task
@@ -6059,10 +6068,10 @@ export interface DefaultApiInterface {
      * @throws {RequiredError}
      * @memberof DefaultApiInterface
      */
-    collectionsCollectionIdSharingGet(requestParameters: DefaultApiCollectionsCollectionIdSharingGetRequest, options?: RawAxiosRequestConfig): AxiosPromise<SharingStatusResponse>;
+    collectionsCollectionIdSharingGet(requestParameters: DefaultApiCollectionsCollectionIdSharingGetRequest, options?: RawAxiosRequestConfig): AxiosPromise<CollectionSharingStatusResponse>;
 
     /**
-     * Publish a collection to the public marketplace (owner only)
+     * Publish a collection to the marketplace with department scope (owner only)
      * @summary Publish collection to marketplace
      * @param {DefaultApiCollectionsCollectionIdSharingPostRequest} requestParameters Request parameters.
      * @param {*} [options] Override http request option.
@@ -7325,6 +7334,13 @@ export interface DefaultApiCollectionsCollectionIdSharingPostRequest {
      * @memberof DefaultApiCollectionsCollectionIdSharingPost
      */
     readonly collectionId: string
+
+    /**
+     * 
+     * @type {CollectionPublishRequest}
+     * @memberof DefaultApiCollectionsCollectionIdSharingPost
+     */
+    readonly collectionPublishRequest: CollectionPublishRequest
 }
 
 /**
@@ -8510,15 +8526,15 @@ export class DefaultApi extends BaseAPI implements DefaultApiInterface {
     }
 
     /**
-     * Publish a collection to the public marketplace (owner only)
+     * Publish a collection to the marketplace with department scope (owner only)
      * @summary Publish collection to marketplace
      * @param {DefaultApiCollectionsCollectionIdSharingPostRequest} requestParameters Request parameters.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof DefaultApi
      */
     public collectionsCollectionIdSharingPost(requestParameters: DefaultApiCollectionsCollectionIdSharingPostRequest, options?: RawAxiosRequestConfig) {
-        return DefaultApiFp(this.configuration).collectionsCollectionIdSharingPost(requestParameters.collectionId, options).then((request) => request(this.axios, this.basePath));
+        return DefaultApiFp(this.configuration).collectionsCollectionIdSharingPost(requestParameters.collectionId, requestParameters.collectionPublishRequest, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**

web/src/api/models/collection-publish-request.ts

@@ -0,0 +1,30 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * ApeRAG API
+ * ApeRAG API Documentation
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+
+/**
+ * 
+ * @export
+ * @interface CollectionPublishRequest
+ */
+export interface CollectionPublishRequest {
+    /**
+     * List of department IDs to publish to, or [\"*\"] for global publishing
+     * @type {Array<string>}
+     * @memberof CollectionPublishRequest
+     */
+    'group_ids': Array<string>;
+}
+

web/src/api/models/collection-sharing-status-response.ts

@@ -0,0 +1,42 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * ApeRAG API
+ * ApeRAG API Documentation
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+
+/**
+ * Collection sharing status response
+ * @export
+ * @interface CollectionSharingStatusResponse
+ */
+export interface CollectionSharingStatusResponse {
+    /**
+     * Whether published to marketplace
+     * @type {boolean}
+     * @memberof CollectionSharingStatusResponse
+     */
+    'is_published': boolean;
+    /**
+     * List of department IDs where the collection is published
+     * @type {Array<string>}
+     * @memberof CollectionSharingStatusResponse
+     */
+    'group_ids'?: Array<string>;
+    /**
+     * Whether the collection is published globally
+     * @type {boolean}
+     * @memberof CollectionSharingStatusResponse
+     */
+    'is_global'?: boolean;
+}
+

web/src/api/models/index.ts

@@ -28,6 +28,8 @@ export * from './collection-config';
 export * from './collection-config-anybase';
 export * from './collection-config-object-storage';
 export * from './collection-create';
+export * from './collection-publish-request';
+export * from './collection-sharing-status-response';
 export * from './collection-update';
 export * from './collection-view';
 export * from './collection-view-list';
@@ -159,7 +161,6 @@ export * from './shared-bot-list';
 export * from './shared-collection';
 export * from './shared-collection-config';
 export * from './shared-collection-list';
-export * from './sharing-status-response';
 export * from './suggestion-action-request';
 export * from './suggestion-action-response';
 export * from './summary-search-params';

web/src/api/models/sharing-status-response.ts

@@ -1873,7 +1873,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/SharingStatusResponse'
+                $ref: '#/components/schemas/CollectionSharingStatusResponse'
         '401':
           description: Unauthorized
           content:
@@ -1900,7 +1900,7 @@ paths:
                 $ref: '#/components/schemas/failResponse'
     post:
       summary: Publish collection to marketplace
-      description: Publish a collection to the public marketplace (owner only)
+      description: Publish a collection to the marketplace with department scope (owner only)
       security:
         - BearerAuth: []
       parameters:
@@ -1910,6 +1910,12 @@ paths:
           schema:
             type: string
           description: Collection ID
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/collectionPublishRequest'
       responses:
         '204':
           description: Collection published successfully
@@ -6429,20 +6435,37 @@ components:
         - message
         - suggestion_id
         - action
-    SharingStatusResponse:
+    CollectionSharingStatusResponse:
       type: object
-      description: Simple sharing status response
+      description: Collection sharing status response
       properties:
         is_published:
           type: boolean
           description: Whether published to marketplace
-        published_at:
-          type: string
-          format: date-time
-          nullable: true
-          description: Publication time, null when not published
+        group_ids:
+          type: array
+          items:
+            type: string
+          description: List of department IDs where the collection is published
+        is_global:
+          type: boolean
+          description: Whether the collection is published globally
       required:
         - is_published
+    collectionPublishRequest:
+      type: object
+      properties:
+        group_ids:
+          type: array
+          items:
+            type: string
+          description: List of department IDs to publish to, or ["*"] for global publishing
+          example:
+            - '*'
+            - dp_1
+            - dp_2
+      required:
+        - group_ids
     SharedCollectionConfig:
       type: object
       description: Configuration settings for shared collection features

web/src/api/openapi.merged.yaml

@@ -67,12 +67,12 @@ export function SignInForm({
   );
 
   useEffect(() => {
-    if (top) {
+    if (top && process.env.NODE_ENV === 'production') {
       top.window.location.href = `/login?redirect_url=${redirectTo}`;
     }
   }, [redirectTo]);
 
-  if (top) {
+  if (process.env.NODE_ENV === 'production') {
     return;
   }