From f4646afbe2c435d231840effb88ad7b7050cf012 Mon Sep 17 00:00:00 2001 From: meta-d Date: Thu, 5 Dec 2024 00:32:26 +0800 Subject: [PATCH 01/11] feat: workspace general settings --- .../@core/services/xpert-workspace.service.ts | 14 ++- .../xpert/workspace/home/home.component.ts | 14 ++- .../settings/general/general.component.html | 64 ++++++++++++ .../settings/general/general.component.scss | 3 + .../settings/general/general.component.ts | 98 +++++++++++++++++++ .../members/members.component.html | 3 +- .../members/members.component.scss | 0 .../members/members.component.ts | 2 +- .../models/models.component.html | 0 .../models/models.component.scss | 0 .../{ => settings}/models/models.component.ts | 0 .../settings/settings.component.html | 21 +++- .../workspace/settings/settings.component.ts | 23 +++-- .../workspace/welcome/welcome.component.ts | 6 +- apps/cloud/src/assets/i18n/zh-Hans.json | 15 ++- apps/cloud/src/styles/components/button.scss | 2 +- .../xpert-workspace/workspace.controller.ts | 16 ++- .../src/xpert-workspace/workspace.service.ts | 26 +++-- .../server-ai/src/xpert/dto/xpert-dsl.dto.ts | 69 +++++++++++++ 19 files changed, 347 insertions(+), 29 deletions(-) create mode 100644 apps/cloud/src/app/features/xpert/workspace/settings/general/general.component.html create mode 100644 apps/cloud/src/app/features/xpert/workspace/settings/general/general.component.scss create mode 100644 apps/cloud/src/app/features/xpert/workspace/settings/general/general.component.ts rename apps/cloud/src/app/features/xpert/workspace/{ => settings}/members/members.component.html (96%) rename apps/cloud/src/app/features/xpert/workspace/{ => settings}/members/members.component.scss (100%) rename apps/cloud/src/app/features/xpert/workspace/{ => settings}/members/members.component.ts (97%) rename apps/cloud/src/app/features/xpert/workspace/{ => settings}/models/models.component.html (100%) rename apps/cloud/src/app/features/xpert/workspace/{ => settings}/models/models.component.scss (100%) rename apps/cloud/src/app/features/xpert/workspace/{ => settings}/models/models.component.ts (100%) diff --git a/apps/cloud/src/app/@core/services/xpert-workspace.service.ts b/apps/cloud/src/app/@core/services/xpert-workspace.service.ts index db5b08dc7..b4339eb65 100644 --- a/apps/cloud/src/app/@core/services/xpert-workspace.service.ts +++ b/apps/cloud/src/app/@core/services/xpert-workspace.service.ts @@ -15,10 +15,14 @@ export class XpertWorkspaceService extends OrganizationBaseCrudService) { return this.selectOrganizationId().pipe( switchMap(() => - this.#refresh.pipe(switchMap(() => this.httpClient.get<{ items: IXpertWorkspace[] }>(this.apiBaseUrl + `/my`))) + this.#refresh.pipe( + switchMap(() => + this.httpClient.get<{ items: IXpertWorkspace[] }>(this.apiBaseUrl + `/my`, { params: toHttpParams(params) }) + ) + ) ) ) } @@ -31,6 +35,10 @@ export class XpertWorkspaceService extends OrganizationBaseCrudService(this.apiBaseUrl + `/${id}/members`, members) } + archive(id: string) { + return this.httpClient.post(this.apiBaseUrl + `/${id}/archive`, {}) + } + refresh() { this.#refresh.next() } @@ -50,4 +58,4 @@ export class XpertWorkspaceBaseCrudService extends OrganizationBaseCrudServic export function injectWorkspaceService() { return inject(XpertWorkspaceService) -} \ No newline at end of file +} diff --git a/apps/cloud/src/app/features/xpert/workspace/home/home.component.ts b/apps/cloud/src/app/features/xpert/workspace/home/home.component.ts index 99fc27133..7bb0aeb02 100644 --- a/apps/cloud/src/app/features/xpert/workspace/home/home.component.ts +++ b/apps/cloud/src/app/features/xpert/workspace/home/home.component.ts @@ -33,6 +33,7 @@ import { injectTags, injectUser, ITag, + OrderTypeEnum, routeAnimations, TagCategoryEnum, ToastrService, @@ -99,7 +100,11 @@ export class XpertWorkspaceHomeComponent { readonly isMobile = this.appService.isMobile readonly lang = this.appService.lang - readonly workspaces = toSignal(this.workspaceService.getAllMy().pipe(map(({ items }) => items)), {initialValue: null}) + readonly workspaces = toSignal( + this.workspaceService.getAllMy({ order: { updatedAt: OrderTypeEnum.DESC } }) + .pipe(map(({ items }) => items)), + {initialValue: null} + ) readonly selectedWorkspaces = model([]) readonly workspace = computed(() => this.workspaces()?.find((_) => _.id === this.selectedWorkspaces()[0]), { equal: (a, b) => a?.id === b?.id @@ -187,6 +192,11 @@ export class XpertWorkspaceHomeComponent { } }) .afterClosed() - .subscribe() + .subscribe((event) => { + if (event === 'deleted' || event === 'archived') { + this.workspaceService.refresh() + this.router.navigate(['/xpert/w']) + } + }) } } diff --git a/apps/cloud/src/app/features/xpert/workspace/settings/general/general.component.html b/apps/cloud/src/app/features/xpert/workspace/settings/general/general.component.html new file mode 100644 index 000000000..e46257669 --- /dev/null +++ b/apps/cloud/src/app/features/xpert/workspace/settings/general/general.component.html @@ -0,0 +1,64 @@ +
+
{{'PAC.Xpert.General' | translate: {Default: 'General'} }}
+
+
+
+ +
+
+
+ + +
+ +
+ +
+
+ {{ 'PAC.KEY_WORDS.DangerZone' | translate: {Default: 'Danger zone'} }} +
+ +
+
+
+
+ {{ 'PAC.Xpert.ArchiveWorkspace' | translate: {Default: 'Archive this workspace'} }} +
+
+ {{ 'PAC.Xpert.ArchiveWorkspaceDesc' | translate: {Default: 'Mark this workspace and all its xperts and toolsets as archived and read-only'} }}. +
+
+ + +
+ +
+ +
+
+
+ {{ 'PAC.Xpert.DeleteWorkspace' | translate: {Default: 'Delete this workspace'} }} +
+
+ {{ 'PAC.Xpert.DeleteWorkspaceDesc' | translate: {Default: 'Once deleted, it will be gone forever. Please be certain'} }}. +
+
+ + +
+
+
+ + @if (loading()) { + + } +
\ No newline at end of file diff --git a/apps/cloud/src/app/features/xpert/workspace/settings/general/general.component.scss b/apps/cloud/src/app/features/xpert/workspace/settings/general/general.component.scss new file mode 100644 index 000000000..b169cbb7c --- /dev/null +++ b/apps/cloud/src/app/features/xpert/workspace/settings/general/general.component.scss @@ -0,0 +1,3 @@ +:host { + @apply flex flex-col; +} \ No newline at end of file diff --git a/apps/cloud/src/app/features/xpert/workspace/settings/general/general.component.ts b/apps/cloud/src/app/features/xpert/workspace/settings/general/general.component.ts new file mode 100644 index 000000000..3153603c5 --- /dev/null +++ b/apps/cloud/src/app/features/xpert/workspace/settings/general/general.component.ts @@ -0,0 +1,98 @@ +import { CdkListboxModule } from '@angular/cdk/listbox' +import { CommonModule } from '@angular/common' +import { Component, effect, input, model, output, signal } from '@angular/core' +import { FormsModule } from '@angular/forms' +import { NgmSpinComponent } from '@metad/ocap-angular/common' +import { TranslateModule } from '@ngx-translate/core' +import { + getErrorMessage, + IfAnimation, + injectToastr, + injectWorkspaceService, + IXpertWorkspace +} from 'apps/cloud/src/app/@core' + +@Component({ + selector: 'xpert-workspace-settings-general', + standalone: true, + imports: [CommonModule, FormsModule, CdkListboxModule, TranslateModule, NgmSpinComponent], + templateUrl: './general.component.html', + styleUrl: './general.component.scss', + animations: [IfAnimation] +}) +export class XpertWorkspaceSettingsGeneralComponent { + readonly workspaceService = injectWorkspaceService() + readonly #toastr = injectToastr() + + // Inputs + readonly workspace = input() + + // Outputs + readonly deleted = output() + readonly archived = output() + + readonly name = model() + + readonly loading = signal(false) + + constructor() { + effect( + () => { + if (this.workspace()) { + this.name.set(this.workspace().name) + } + }, + { allowSignalWrites: true } + ) + } + + update() { + this.loading.set(true) + this.workspaceService + .update(this.workspace().id, { + name: this.name() + }) + .subscribe({ + next: () => { + this.loading.set(false) + this.#toastr.success('PAC.Messages.UpdatedSuccessfully', { Default: 'Updated successfully' }) + }, + error: (error) => { + this.loading.set(false) + this.#toastr.error(getErrorMessage(error)) + } + }) + } + + archive() { + this.loading.set(true) + this.workspaceService.archive(this.workspace().id) + .subscribe({ + next: () => { + this.loading.set(false) + this.archived.emit() + this.#toastr.success('PAC.Messages.ArchivedSuccessfully', { Default: 'Archived successfully' }) + }, + error: (error) => { + this.loading.set(false) + this.#toastr.error(getErrorMessage(error)) + } + }) + } + + delete() { + this.loading.set(true) + this.workspaceService.delete(this.workspace().id) + .subscribe({ + next: () => { + this.loading.set(false) + this.deleted.emit() + this.#toastr.success('PAC.Messages.DeletedSuccessfully', { Default: 'Deleted successfully' }) + }, + error: (error) => { + this.loading.set(false) + this.#toastr.error(getErrorMessage(error)) + } + }) + } +} diff --git a/apps/cloud/src/app/features/xpert/workspace/members/members.component.html b/apps/cloud/src/app/features/xpert/workspace/settings/members/members.component.html similarity index 96% rename from apps/cloud/src/app/features/xpert/workspace/members/members.component.html rename to apps/cloud/src/app/features/xpert/workspace/settings/members/members.component.html index d2d12e93a..51596372d 100644 --- a/apps/cloud/src/app/features/xpert/workspace/members/members.component.html +++ b/apps/cloud/src/app/features/xpert/workspace/settings/members/members.component.html @@ -1,9 +1,10 @@
-
{{'PAC.Xpert.Members' | translate: {Default: 'Members'} }}
+
{{'PAC.Xpert.Members' | translate: {Default: 'Members'} }}
+
diff --git a/apps/cloud/src/app/features/xpert/workspace/members/members.component.scss b/apps/cloud/src/app/features/xpert/workspace/settings/members/members.component.scss similarity index 100% rename from apps/cloud/src/app/features/xpert/workspace/members/members.component.scss rename to apps/cloud/src/app/features/xpert/workspace/settings/members/members.component.scss diff --git a/apps/cloud/src/app/features/xpert/workspace/members/members.component.ts b/apps/cloud/src/app/features/xpert/workspace/settings/members/members.component.ts similarity index 97% rename from apps/cloud/src/app/features/xpert/workspace/members/members.component.ts rename to apps/cloud/src/app/features/xpert/workspace/settings/members/members.component.ts index e6e10b6d2..4be06b9ea 100644 --- a/apps/cloud/src/app/features/xpert/workspace/members/members.component.ts +++ b/apps/cloud/src/app/features/xpert/workspace/settings/members/members.component.ts @@ -9,7 +9,7 @@ import { injectUser, IUser, IXpertWorkspace, XpertWorkspaceService } from 'apps/ import { UserPipe, UserRoleSelectComponent } from 'apps/cloud/src/app/@shared' import { uniqBy } from 'lodash-es' import { EMPTY, filter, switchMap } from 'rxjs' -import { UserProfileInlineComponent } from '../../../../@shared/' +import { UserProfileInlineComponent } from '../../../../../@shared/' @Component({ selector: 'xpert-workspace-members', diff --git a/apps/cloud/src/app/features/xpert/workspace/models/models.component.html b/apps/cloud/src/app/features/xpert/workspace/settings/models/models.component.html similarity index 100% rename from apps/cloud/src/app/features/xpert/workspace/models/models.component.html rename to apps/cloud/src/app/features/xpert/workspace/settings/models/models.component.html diff --git a/apps/cloud/src/app/features/xpert/workspace/models/models.component.scss b/apps/cloud/src/app/features/xpert/workspace/settings/models/models.component.scss similarity index 100% rename from apps/cloud/src/app/features/xpert/workspace/models/models.component.scss rename to apps/cloud/src/app/features/xpert/workspace/settings/models/models.component.scss diff --git a/apps/cloud/src/app/features/xpert/workspace/models/models.component.ts b/apps/cloud/src/app/features/xpert/workspace/settings/models/models.component.ts similarity index 100% rename from apps/cloud/src/app/features/xpert/workspace/models/models.component.ts rename to apps/cloud/src/app/features/xpert/workspace/settings/models/models.component.ts diff --git a/apps/cloud/src/app/features/xpert/workspace/settings/settings.component.html b/apps/cloud/src/app/features/xpert/workspace/settings/settings.component.html index d4df9f975..25b558069 100644 --- a/apps/cloud/src/app/features/xpert/workspace/settings/settings.component.html +++ b/apps/cloud/src/app/features/xpert/workspace/settings/settings.component.html @@ -7,6 +7,18 @@
{{ 'PAC.KEY_WORDS.Workspace' | translate: {Default: 'Workspace'} }}
    +
  • + + + +
    {{ 'PAC.Xpert.General' | translate: {Default: 'General'} }}
    +
    • +
  • @switch(menu()) { + @case('general') { + + } @case('models') { } diff --git a/apps/cloud/src/app/features/xpert/workspace/settings/settings.component.ts b/apps/cloud/src/app/features/xpert/workspace/settings/settings.component.ts index c5f493d3d..b5aab5200 100644 --- a/apps/cloud/src/app/features/xpert/workspace/settings/settings.component.ts +++ b/apps/cloud/src/app/features/xpert/workspace/settings/settings.component.ts @@ -3,16 +3,19 @@ import { Component, computed, inject, model, signal } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { IfAnimation, XpertWorkspaceService } from 'apps/cloud/src/app/@core'; import { derivedAsync } from 'ngxtension/derived-async'; -import { XpertWorkspaceMembersComponent } from '../members/members.component'; +import { XpertWorkspaceMembersComponent } from './members/members.component'; import { CdkListboxModule } from '@angular/cdk/listbox'; import { FormsModule } from '@angular/forms'; -import { XpertWorkspaceModelsComponent } from '../models/models.component'; +import { XpertWorkspaceModelsComponent } from './models/models.component'; import { TranslateModule } from '@ngx-translate/core'; +import { XpertWorkspaceSettingsGeneralComponent } from './general/general.component'; @Component({ selector: 'xpert-workspace-settings', standalone: true, - imports: [CommonModule, FormsModule, CdkListboxModule, TranslateModule, XpertWorkspaceModelsComponent, XpertWorkspaceMembersComponent], + imports: [CommonModule, FormsModule, CdkListboxModule, TranslateModule, + XpertWorkspaceModelsComponent, XpertWorkspaceMembersComponent, + XpertWorkspaceSettingsGeneralComponent], templateUrl: './settings.component.html', styleUrl: './settings.component.scss', animations: [IfAnimation] @@ -31,10 +34,18 @@ export class XpertWorkspaceSettingsComponent { readonly owner = computed(() => this.workspace()?.owner) - readonly selectedMenus = model>(['members']) + readonly selectedMenus = model>(['general']) readonly menu = computed(() => this.selectedMenus()[0]) - close() { - this.#dialogRef.close() + close(reason?: string) { + this.#dialogRef.close(reason) + } + + onDeleted() { + this.close('deleted') + } + + onArchived() { + this.close('archived') } } diff --git a/apps/cloud/src/app/features/xpert/workspace/welcome/welcome.component.ts b/apps/cloud/src/app/features/xpert/workspace/welcome/welcome.component.ts index 2a402b6bb..1f9074c83 100644 --- a/apps/cloud/src/app/features/xpert/workspace/welcome/welcome.component.ts +++ b/apps/cloud/src/app/features/xpert/workspace/welcome/welcome.component.ts @@ -1,5 +1,5 @@ import { CommonModule } from '@angular/common' -import { ChangeDetectionStrategy, Component, inject } from '@angular/core' +import { ChangeDetectionStrategy, Component, computed, inject } from '@angular/core' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { Router, RouterModule } from '@angular/router' import { IXpertWorkspace } from '@metad/contracts' @@ -22,7 +22,9 @@ export class XpertWorkspaceWelcomeComponent { readonly #router = inject(Router) readonly me = injectUser() - readonly workspaces = this.homeComponent.workspaces + readonly workspaces = computed(() => { + return this.homeComponent.workspaces()?.slice(0, 10) + }) newWorkspace() { this.homeComponent.newWorkspace() diff --git a/apps/cloud/src/assets/i18n/zh-Hans.json b/apps/cloud/src/assets/i18n/zh-Hans.json index c231fabc0..7119450c4 100644 --- a/apps/cloud/src/assets/i18n/zh-Hans.json +++ b/apps/cloud/src/assets/i18n/zh-Hans.json @@ -261,7 +261,8 @@ "Feedback": "用户反馈", "HelpDocs": "帮助文档", "Embedded": "已嵌入", - "Copied": "已复制" + "Copied": "已复制", + "DangerZone": "危险区域" }, "MENU": { "Certification": "认证", @@ -509,7 +510,8 @@ "NewTag": "新建标签", "Duplicate": "复制", "OpenAttributesPanel": "打开属性面板", - "Close": "关闭" + "Close": "关闭", + "Update": "更新" }, "MESSAGE": { "MAIN_ORGANIZATION_UPDATED": "组织更新成功", @@ -537,6 +539,7 @@ "SavedSuccessfully": "保存成功", "UpdatedSuccessfully": "更新成功", "UploadSuccessfully": "上传成功", + "ArchivedSuccessfully": "已成功归档", "NoRecordsFoundinFile": "文件中未找到记录", "UnsavedChanges": "未保存的更改", "SavedDraft": "草稿已保存！" @@ -2002,7 +2005,13 @@ "Input": "输入", "Retrieval": "检索", "Examples": "示例", - "YouMightAsk": "你可能想问" + "YouMightAsk": "你可能想问", + "General": "通用", + "EnterWorkspaceName": "输入工作空间名称", + "ArchiveWorkspace": "归档此工作空间", + "DeleteWorkspace": "删除此工作空间", + "ArchiveWorkspaceDesc": "将此工作区及其所有专家和工具集标记为已存档和只读", + "DeleteWorkspaceDesc": "一旦删除，它将永远消失，请确保" }, "title": { "short": "Xpert AI" diff --git a/apps/cloud/src/styles/components/button.scss b/apps/cloud/src/styles/components/button.scss index cd772d1ed..106b612b0 100644 --- a/apps/cloud/src/styles/components/button.scss +++ b/apps/cloud/src/styles/components/button.scss @@ -99,7 +99,7 @@ } .btn { - &.btn-danger { + &.btn-danger, &.danger { @apply text-red-500 border-red-50 hover:border-red-500 hover:bg-red-50; } } diff --git a/packages/server-ai/src/xpert-workspace/workspace.controller.ts b/packages/server-ai/src/xpert-workspace/workspace.controller.ts index b7e71442a..9b5b4bfab 100644 --- a/packages/server-ai/src/xpert-workspace/workspace.controller.ts +++ b/packages/server-ai/src/xpert-workspace/workspace.controller.ts @@ -21,7 +21,8 @@ import { UseGuards, UseInterceptors, Param, - Put + Put, + Delete } from '@nestjs/common' import { CommandBus } from '@nestjs/cqrs' import { ApiBearerAuth, ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger' @@ -30,6 +31,7 @@ import { XpertWorkspaceService } from './workspace.service' import { WorkspaceGuard } from './guards/workspace.guard' import { WorkspaceOwnerGuard } from './guards/workspace-owner.guard' import { XpertWorkspaceDTO } from './dto' +import { Not } from 'typeorm' @ApiTags('XpertWorkspace') @ApiBearerAuth() @@ -91,4 +93,16 @@ export class XpertWorkspaceController extends CrudController { const workspace = await this.service.updateMembers(id, members) return new XpertWorkspaceDTO(workspace) } + + @UseGuards(WorkspaceOwnerGuard) + @Delete(':workspaceId') + async delete(@Param('workspaceId') id: string,) { + return await this.service.delete(id) + } + + @UseGuards(WorkspaceOwnerGuard) + @Post(':workspaceId/archive') + async archive(@Param('workspaceId') id: string,) { + return await this.service.update(id, { status: 'archived' }) + } } diff --git a/packages/server-ai/src/xpert-workspace/workspace.service.ts b/packages/server-ai/src/xpert-workspace/workspace.service.ts index 1a881e510..352f2b67a 100644 --- a/packages/server-ai/src/xpert-workspace/workspace.service.ts +++ b/packages/server-ai/src/xpert-workspace/workspace.service.ts @@ -2,7 +2,7 @@ import { IUser } from '@metad/contracts' import { PaginationParams, RequestContext, TenantOrganizationAwareCrudService } from '@metad/server-core' import { Injectable, Logger } from '@nestjs/common' import { InjectRepository } from '@nestjs/typeorm' -import { Repository } from 'typeorm' +import { Brackets, Repository } from 'typeorm' import { WorkspacePublicDTO } from './dto' import { XpertWorkspace } from './workspace.entity' @@ -21,15 +21,27 @@ export class XpertWorkspaceService extends TenantOrganizationAwareCrudService { + order[`workspace.${name}`] = options.order[name] + return order + }, {}) : {} + + const query = this.repository .createQueryBuilder('workspace') .leftJoinAndSelect('workspace.members', 'member') - .where('workspace.ownerId = :ownerId', { ownerId: user.id }) - .andWhere('workspace.tenantId = :tenantId', { tenantId: user.tenantId }) + .where('workspace.tenantId = :tenantId', { tenantId: user.tenantId }) .andWhere('workspace.organizationId = :organizationId', { organizationId }) - .orWhere('member.id = :userId', { userId: user.id }) - .andWhere('member.tenantId = :tenantId', { tenantId: user.tenantId }) - .getMany() + .andWhere(new Brackets((qb) => { + qb.where(`workspace.status <> 'archived'`) + .orWhere(`workspace.status IS NULL`) + })) + .andWhere(new Brackets((qb) => { + qb.where('workspace.ownerId = :ownerId', { ownerId: user.id }) + .orWhere('member.id = :userId', { userId: user.id }) + })) + .orderBy(orderBy) + + const workspaces = await query.getMany() return { items: workspaces.map((item) => new WorkspacePublicDTO(item)) diff --git a/packages/server-ai/src/xpert/dto/xpert-dsl.dto.ts b/packages/server-ai/src/xpert/dto/xpert-dsl.dto.ts index d112be8a8..246bf0ff7 100644 --- a/packages/server-ai/src/xpert/dto/xpert-dsl.dto.ts +++ b/packages/server-ai/src/xpert/dto/xpert-dsl.dto.ts @@ -56,9 +56,11 @@ export class XpertDslDTO { copilotModel?: ICopilotModel @Expose() + @Transform(({ value }) => value?.map((item) => new KnowledgebaseDslDTO(item))) knowledgebases?: IKnowledgebase[] @Expose() + @Transform(({ value }) => value?.map((item) => new XpertToolsetDslDTO(item))) toolsets?: IXpertToolset[] @Expose() @@ -85,6 +87,24 @@ export class XpertDraftDslDTO implements TXpertTeamDraft { entity: new XpertAgentDslDTO(node.entity) } } + case 'toolset': { + return { + ...node, + entity: new XpertToolsetDslDTO(node.entity) + } + } + case 'knowledge': { + return { + ...node, + entity: new KnowledgebaseDslDTO(node.entity) + } + } + case 'xpert': { + return { + ...node, + entity: new XpertDslDTO(node.entity) + } + } default: { return node } @@ -166,3 +186,52 @@ export class CopilotModelDslDTO implements TCopilotModel { Object.assign(this, partial) } } + +@Exclude() +export class XpertToolsetDslDTO { + @Expose() + id?: string + + @Expose() + name: string + + @Expose() + type: string + + @Expose() + category: string + + @Expose() + description: string + @Expose() + avatar: TAvatar + + @Expose() + options: null + + @Expose() + privacyPolicy: null + + @Expose() + customDisclaimer: null + + @Expose() + tags: any[] + + constructor(partial: Partial) { + Object.assign(this, partial) + } +} + +@Exclude() +export class KnowledgebaseDslDTO { + @Expose() + id?: string + + @Expose() + name: string + + constructor(partial: Partial) { + Object.assign(this, partial) + } +} \ No newline at end of file From 61f8f8f21005efa365cd27c389ed650203188776 Mon Sep 17 00:00:00 2001 From: meta-d Date: Thu, 5 Dec 2024 11:50:26 +0800 Subject: [PATCH 02/11] feat: support Multi-Platform docker images --- .../workflows/docker-build-publish-demo.yml | 170 ++++++++---------- 1 file changed, 74 insertions(+), 96 deletions(-) diff --git a/.github/workflows/docker-build-publish-demo.yml b/.github/workflows/docker-build-publish-demo.yml index 69a437c1d..38723c12c 100644 --- a/.github/workflows/docker-build-publish-demo.yml +++ b/.github/workflows/docker-build-publish-demo.yml @@ -1,4 +1,4 @@ -name: Build and Publish Docker Images Demo +name: Docker Images Multi-Platform on: push: @@ -10,111 +10,89 @@ permissions: contents: read packages: write -jobs: - - xpert-api: +env: + DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + ACR_USERNAME: ${{ secrets.ACR_USERNAME }} + ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }} +jobs: + build: runs-on: ubuntu-latest - environment: production - steps: - - uses: actions/checkout@v4 - - name: Build - uses: docker/build-push-action@v6.3.0 - with: - context: . - file: ./.deploy/api/Dockerfile - load: true - platforms: linux/amd64 - tags: | - ghcr.io/xpert-ai/xpert-api-demo:latest - metadc/xpert-api-demo:latest - registry.cn-hangzhou.aliyuncs.com/metad/xpert-api-demo:latest - cache-from: type=registry,ref=metadc/xpert-api-demo:latest - cache-to: type=inline - - name: Docker images list - run: | - sudo docker image list - - - name: Login to DockerHub - uses: docker/login-action@v3.2.0 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + strategy: + matrix: + service: + - { name: "xpert-api", context: ".deploy/api", image_name: "xpert-api-demo" } + - { name: "xpert-webapp", context: ".deploy/webapp", image_name: "xpert-webapp-demo" } + platform: [ "linux/amd64", "linux/arm64" ] - - name: Push to Docker Hub Registry - run: | - docker push metadc/xpert-api-demo:latest + steps: + - uses: actions/checkout@v4 - - name: Login to GitHub Container Registry - uses: docker/login-action@v3.2.0 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} + - name: Login to DockerHub + uses: docker/login-action@v3.2.0 + with: + username: ${{ env.DOCKERHUB_USERNAME }} + password: ${{ env.DOCKERHUB_TOKEN }} - - name: Push to Github Registry - run: | - docker push ghcr.io/xpert-ai/xpert-api-demo:latest + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 - - uses: aliyun/acr-login@v1 - with: - login-server: https://registry.cn-hangzhou.aliyuncs.com - username: "${{ secrets.ACR_USERNAME }}" - password: "${{ secrets.ACR_PASSWORD }}" + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 - - name: Push to Aliyun Registry - run: | - docker push registry.cn-hangzhou.aliyuncs.com/metad/xpert-api-demo:latest - - xpert-webapp: + - name: Extract metadata for Docker + id: meta + uses: docker/metadata-action@v5 + with: + images: | + ghcr.io/xpert-ai/${{ matrix.service.image_name }} + metadc/${{ matrix.service.image_name }} + registry.cn-hangzhou.aliyuncs.com/metad/${{ matrix.service.image_name }} - runs-on: ubuntu-latest - environment: production - steps: - - uses: actions/checkout@v4 - - name: Build - uses: docker/build-push-action@v6.3.0 - with: - context: . - file: ./.deploy/webapp/Dockerfile - load: true - platforms: linux/amd64 + - name: Build and Push Docker Images + uses: docker/build-push-action@v6 + with: + context: ${{ matrix.service.context }} + file: ${{ matrix.service.context }}/Dockerfile + platforms: ${{ matrix.platform }} tags: | - ghcr.io/xpert-ai/xpert-webapp-demo:latest - metadc/xpert-webapp-demo:latest - registry.cn-hangzhou.aliyuncs.com/metad/xpert-webapp-demo:latest - cache-from: type=registry,ref=metadc/xpert-webapp-demo:latest - cache-to: type=inline - - name: Docker images list - run: | - sudo docker image list - - name: Login to DockerHub - uses: docker/login-action@v3.2.0 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Push to Docker Hub Registry - run: | - docker push metadc/xpert-webapp-demo:latest + ghcr.io/xpert-ai/${{ matrix.service.image_name }}:latest + metadc/${{ matrix.service.image_name }}:latest + registry.cn-hangzhou.aliyuncs.com/metad/${{ matrix.service.image_name }}:latest + cache-from: type=gha + cache-to: type=gha,mode=max + labels: ${{ steps.meta.outputs.labels }} - - name: Login to GitHub Container Registry - uses: docker/login-action@v3.2.0 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} + create-manifest: + needs: build + runs-on: ubuntu-latest + strategy: + matrix: + service: + - { name: "xpert-api", image_name: "xpert-api-demo" } + - { name: "xpert-webapp", image_name: "xpert-webapp-demo" } - - name: Push to Github Registry - run: | - docker push ghcr.io/xpert-ai/xpert-webapp-demo:latest + steps: + - name: Login to DockerHub + uses: docker/login-action@v3.2.0 + with: + username: ${{ env.DOCKERHUB_USERNAME }} + password: ${{ env.DOCKERHUB_TOKEN }} - - uses: aliyun/acr-login@v1 - with: - login-server: https://registry.cn-hangzhou.aliyuncs.com - username: "${{ secrets.ACR_USERNAME }}" - password: "${{ secrets.ACR_PASSWORD }}" + - name: Create and Push Multi-Platform Manifest + uses: docker/manifest-create-action@v1 + with: + image: | + ghcr.io/xpert-ai/${{ matrix.service.image_name }}:latest + metadc/${{ matrix.service.image_name }}:latest + registry.cn-hangzhou.aliyuncs.com/metad/${{ matrix.service.image_name }}:latest + platforms: | + linux/amd64 + linux/arm64 - - name: Push to Aliyun Registry - run: | - docker push registry.cn-hangzhou.aliyuncs.com/metad/xpert-webapp-demo:latest + - name: Push Manifest to Docker Registries + run: | + docker push ghcr.io/xpert-ai/${{ matrix.service.image_name }}:latest + docker push metadc/${{ matrix.service.image_name }}:latest + docker push registry.cn-hangzhou.aliyuncs.com/metad/${{ matrix.service.image_name }}:latest From aad8e9d0c2745437bcbc60cbe48d050d9480c873 Mon Sep 17 00:00:00 2001 From: meta-d Date: Thu, 5 Dec 2024 11:56:08 +0800 Subject: [PATCH 03/11] Fix: add environment production --- .github/workflows/docker-build-publish-demo.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build-publish-demo.yml b/.github/workflows/docker-build-publish-demo.yml index 38723c12c..0680371ec 100644 --- a/.github/workflows/docker-build-publish-demo.yml +++ b/.github/workflows/docker-build-publish-demo.yml @@ -25,7 +25,7 @@ jobs: - { name: "xpert-api", context: ".deploy/api", image_name: "xpert-api-demo" } - { name: "xpert-webapp", context: ".deploy/webapp", image_name: "xpert-webapp-demo" } platform: [ "linux/amd64", "linux/arm64" ] - + environment: production steps: - uses: actions/checkout@v4 @@ -72,7 +72,8 @@ jobs: service: - { name: "xpert-api", image_name: "xpert-api-demo" } - { name: "xpert-webapp", image_name: "xpert-webapp-demo" } - + environment: production + steps: - name: Login to DockerHub uses: docker/login-action@v3.2.0 From 452f1cf467e2a81eeb2bc9ef500d6ccf353909e4 Mon Sep 17 00:00:00 2001 From: meta-d Date: Thu, 5 Dec 2024 12:00:20 +0800 Subject: [PATCH 04/11] Fix: change the context --- .github/workflows/docker-build-publish-demo.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build-publish-demo.yml b/.github/workflows/docker-build-publish-demo.yml index 0680371ec..4c142cfa9 100644 --- a/.github/workflows/docker-build-publish-demo.yml +++ b/.github/workflows/docker-build-publish-demo.yml @@ -53,7 +53,7 @@ jobs: - name: Build and Push Docker Images uses: docker/build-push-action@v6 with: - context: ${{ matrix.service.context }} + context: . file: ${{ matrix.service.context }}/Dockerfile platforms: ${{ matrix.platform }} tags: | @@ -73,7 +73,7 @@ jobs: - { name: "xpert-api", image_name: "xpert-api-demo" } - { name: "xpert-webapp", image_name: "xpert-webapp-demo" } environment: production - + steps: - name: Login to DockerHub uses: docker/login-action@v3.2.0 From 080f2452678ca8f0d50dd8af6a8487bb4ab11ef9 Mon Sep 17 00:00:00 2001 From: meta-d Date: Thu, 5 Dec 2024 12:16:01 +0800 Subject: [PATCH 05/11] Fix: remove webapp image --- .github/workflows/docker-build-publish-demo.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build-publish-demo.yml b/.github/workflows/docker-build-publish-demo.yml index 4c142cfa9..635e12871 100644 --- a/.github/workflows/docker-build-publish-demo.yml +++ b/.github/workflows/docker-build-publish-demo.yml @@ -23,7 +23,7 @@ jobs: matrix: service: - { name: "xpert-api", context: ".deploy/api", image_name: "xpert-api-demo" } - - { name: "xpert-webapp", context: ".deploy/webapp", image_name: "xpert-webapp-demo" } + # - { name: "xpert-webapp", context: ".deploy/webapp", image_name: "xpert-webapp-demo" } platform: [ "linux/amd64", "linux/arm64" ] environment: production steps: @@ -71,7 +71,7 @@ jobs: matrix: service: - { name: "xpert-api", image_name: "xpert-api-demo" } - - { name: "xpert-webapp", image_name: "xpert-webapp-demo" } + # - { name: "xpert-webapp", image_name: "xpert-webapp-demo" } environment: production steps: From d46d223353d2c5ce2d964fc83f41cc15f8278657 Mon Sep 17 00:00:00 2001 From: meta-d Date: Thu, 5 Dec 2024 13:11:53 +0800 Subject: [PATCH 06/11] Fix: remove @sap/hana-client for arm platform --- packages/adapter/package.json | 1 - .../adapter/src/adapters/sap-hana.spec.ts | 118 +-- packages/adapter/src/adapters/sap-hana.ts | 696 +++++++++--------- packages/adapter/src/index.ts | 2 +- 4 files changed, 408 insertions(+), 409 deletions(-) diff --git a/packages/adapter/package.json b/packages/adapter/package.json index f56d5c476..9a55bab57 100644 --- a/packages/adapter/package.json +++ b/packages/adapter/package.json @@ -2,7 +2,6 @@ "name": "@metad/adapter", "version": "3.0.0", "dependencies": { - "@sap/hana-client": "^2.20.20", "axios": "^0.21.4", "clickhouse": "^2.4.1", "hive-driver": "^0.1.7", diff --git a/packages/adapter/src/adapters/sap-hana.spec.ts b/packages/adapter/src/adapters/sap-hana.spec.ts index aae181dc4..78037069a 100644 --- a/packages/adapter/src/adapters/sap-hana.spec.ts +++ b/packages/adapter/src/adapters/sap-hana.spec.ts @@ -1,71 +1,71 @@ -import { BaseSQLQueryRunner } from '../base' -import { TableTopSubscribed } from './mock' -import { HANAQueryRunner } from './sap-hana' +// import { BaseSQLQueryRunner } from '../base' +// import { TableTopSubscribed } from './mock' +// import { HANAQueryRunner } from './sap-hana' -const HANA_HOST = process.env.SAP_HANA_HOST || '' -const HANA_PORT = Number(process.env.SAP_HANA_PORT || 39017) -const HANA_SCHEMA = process.env.SAP_HANA_SCHEMA || 'Z_DEMO' -const HANA_PASSWORD = process.env.SAP_HANA_PASSWORD || '' +// const HANA_HOST = process.env.SAP_HANA_HOST || '' +// const HANA_PORT = Number(process.env.SAP_HANA_PORT || 39017) +// const HANA_SCHEMA = process.env.SAP_HANA_SCHEMA || 'Z_DEMO' +// const HANA_PASSWORD = process.env.SAP_HANA_PASSWORD || '' -describe('SAP HANA QueryRunner', () => { - let runner: BaseSQLQueryRunner +// describe('SAP HANA QueryRunner', () => { +// let runner: BaseSQLQueryRunner - beforeEach(() => { - runner = new HANAQueryRunner({ - host: HANA_HOST, - port: HANA_PORT, - username: 'system', - password: HANA_PASSWORD, - database: 'SYSTEMDB', - // use_ssl: true, - // ssl_cacert: `` - }) - }) +// beforeEach(() => { +// runner = new HANAQueryRunner({ +// host: HANA_HOST, +// port: HANA_PORT, +// username: 'system', +// password: HANA_PASSWORD, +// database: 'SYSTEMDB', +// // use_ssl: true, +// // ssl_cacert: `` +// }) +// }) - it('#getCatalogs', async () => { - const catalogs = await runner.getCatalogs() - console.log(catalogs) - expect(catalogs.length).toBeGreaterThan(0) - }) +// it('#getCatalogs', async () => { +// const catalogs = await runner.getCatalogs() +// console.log(catalogs) +// expect(catalogs.length).toBeGreaterThan(0) +// }) - it('#getSchema', async () => { - const schema = await runner.getSchema(HANA_SCHEMA) - console.log(JSON.stringify(schema)) - expect(schema.length).toBeGreaterThan(0) - expect(schema[0].tables.length).toBeGreaterThan(0) - }) +// it('#getSchema', async () => { +// const schema = await runner.getSchema(HANA_SCHEMA) +// console.log(JSON.stringify(schema)) +// expect(schema.length).toBeGreaterThan(0) +// expect(schema[0].tables.length).toBeGreaterThan(0) +// }) - it('#describe', async () => { - const result = await runner.describe('foodmart', 'SELECT * FROM topSubscribed') - console.log(result) - }) +// it('#describe', async () => { +// const result = await runner.describe('foodmart', 'SELECT * FROM topSubscribed') +// console.log(result) +// }) - it('#createCatalog', async () => { - await runner.createCatalog(HANA_SCHEMA) - }) +// it('#createCatalog', async () => { +// await runner.createCatalog(HANA_SCHEMA) +// }) - it('#CreateTable', async () => { - const result = await runner.runQuery(`Create Table Demo_HANA ( - ID INTEGER, - NAME VARCHAR(10), - PRIMARY KEY (ID) - );`, { catalog: HANA_SCHEMA }) - console.log(result) - }) +// it('#CreateTable', async () => { +// const result = await runner.runQuery(`Create Table Demo_HANA ( +// ID INTEGER, +// NAME VARCHAR(10), +// PRIMARY KEY (ID) +// );`, { catalog: HANA_SCHEMA }) +// console.log(result) +// }) - it('#ping', async () => { - await runner.ping() - }) +// it('#ping', async () => { +// await runner.ping() +// }) - it('#QueryTable', async () => { - const result = await runner.getSchema(null, 'SupermartGrocerySales') - console.log(result) - }) +// it('#QueryTable', async () => { +// const result = await runner.getSchema(null, 'SupermartGrocerySales') +// console.log(result) +// }) - it('#import', async () => { - await runner.import({...TableTopSubscribed}, {catalog: HANA_SCHEMA}) +// it('#import', async () => { +// await runner.import({...TableTopSubscribed}, {catalog: HANA_SCHEMA}) - const result = await runner.runQuery(`SELECT * FROM "topSubscribed"`, {catalog: HANA_SCHEMA}) - expect(result.data.length).toEqual(15) - }) -}) +// const result = await runner.runQuery(`SELECT * FROM "topSubscribed"`, {catalog: HANA_SCHEMA}) +// expect(result.data.length).toEqual(15) +// }) +// }) diff --git a/packages/adapter/src/adapters/sap-hana.ts b/packages/adapter/src/adapters/sap-hana.ts index 19122b0b8..2a033e4a8 100644 --- a/packages/adapter/src/adapters/sap-hana.ts +++ b/packages/adapter/src/adapters/sap-hana.ts @@ -1,348 +1,348 @@ -import { Connection, createConnection } from '@sap/hana-client' -import { BaseSQLQueryRunner, QueryResult, SQLAdapterOptions, register } from '../base' -import { groupBy } from '../helpers' -import { CreationTable, DBProtocolEnum, DBSyntaxEnum, IDSSchema, QueryOptions } from '../types' - -export interface HANAAdapterOptions extends SQLAdapterOptions { - database: string -} - -export class HANAQueryRunner extends BaseSQLQueryRunner { - readonly name = 'HANA' - readonly type = 'hana' - readonly syntax = DBSyntaxEnum.SQL - readonly protocol = DBProtocolEnum.SQL - - readonly jdbcDriver = 'com.sap.db.jdbc.Driver' - jdbcUrl(schema?: string) { - return `jdbc:sap://${this.options.host}:${this.options.port}/?databaseName=${this.options.database}¤tSchema=${schema}&user=${encodeURIComponent( - this.options.username as string - )}&password=${encodeURIComponent(this.options.password as string)}` - } - - get configurationSchema() { - return { - type: 'object', - properties: { - username: { type: 'string' }, - password: { type: 'string' }, - host: { type: 'string' }, - port: { type: 'number', default: null }, - database: { type: 'string', title: 'Database/Tenant' }, - catalog: { type: 'string', title: 'Schema' }, - // schema: { type: 'string', title: 'Schema' }, - encoding: { type: 'string' } - }, - required: ['username', 'password', 'host', 'port', 'database'], - order: ['host', 'port', 'username', 'password', 'database', 'catalog'], - extra_options: ['encoding'], - secret: ['password'] - } - } - - private connection: Connection - - constructor(options: HANAAdapterOptions) { - super(options) - - this.connection = createConnection() - } - - async connect(options?: QueryOptions): Promise { - const conn_params = { - serverNode: `${this.options.host}:${this.options.port}`, - uid: this.options.username, - pwd: this.options.password, - currentSchema: options?.catalog, - databaseName: this.options.database - } - - return new Promise((resolve, reject) => { - if (this.connection.state() === 'connected') { - resolve(this.connection) - } else { - this.connection.connect(conn_params, (err) => { - if (err) { - return reject(err) - } - resolve(this.connection) - }) - } - }) - } - - async execute(query: string, options?: QueryOptions) { - await this.connect(options) - - return new Promise((resolve, reject) => { - this.connection.exec(query, [], (err, result) => { - if (err) { - return reject(err) - } - this.connection.disconnect() - resolve(result) - }) - }) - } - - /** - * Execute a sql statement in HANA DB - * - * @param query sql statement - * @param options - * @returns - */ - async runQuery(query: string, options?: Record) { - return this.execute(query, options).then((data: any) => { - return { - status: 'OK', - data - } as QueryResult - }) - } - - async getCatalogs(): Promise { - return this.execute(`SELECT * FROM "SYS"."SCHEMAS"`).then((data: any) => { - return data?.map((item) => ({ - ...item, - schema: item.SCHEMA_NAME, - name: item.SCHEMA_NAME - })) - }) - } - - override async getSchema(catalog?: string, tableName?: string): Promise { - let query = '' - if (tableName) { - const tableCondition = `A.TABLE_NAME = '${tableName}'` - const whereCondition = catalog ? `A.SCHEMA_NAME = '${catalog}' AND ${tableCondition}` : tableCondition - query = `SELECT A.SCHEMA_NAME, A.TABLE_NAME, A.COMMENTS AS TABLE_LABEL, COLUMN_NAME, B.COMMENTS AS COLUMN_LABEL, DATA_TYPE_NAME, LENGTH, SCALE, IS_NULLABLE -FROM "SYS"."TABLES" AS A JOIN "SYS"."TABLE_COLUMNS" AS B -ON A.SCHEMA_NAME = B.SCHEMA_NAME AND A.TABLE_NAME = B.TABLE_NAME -WHERE ${whereCondition} ORDER BY A.SCHEMA_NAME, A.TABLE_NAME, B.POSITION` - } else { - query = `SELECT A.SCHEMA_NAME, A.TABLE_NAME, A.COMMENTS AS TABLE_LABEL FROM "SYS"."TABLES" AS A` - if (catalog) { - query = query + ` WHERE A.SCHEMA_NAME = '${catalog}'` - } - } - - return this.execute(query).then((data: any) => { - const tables = [] - const schemas = groupBy(data, 'SCHEMA_NAME') - Object.keys(schemas).forEach((database) => { - const tableGroups = groupBy(schemas[database], 'TABLE_NAME') - Object.keys(tableGroups).forEach((name) => { - tables.push({ - database, - schema: database, - name, - label: tableGroups[name][0].TABLE_LABEL, - columns: tableGroups[name] - .filter((item) => item.COLUMN_NAME) - .map((item) => ({ - name: item.COLUMN_NAME, - label: item.COLUMN_LABEL, - dataType: concatHANAType(item.DATA_TYPE_NAME, item.LENGTH, item.SCALE), - type: hanaTypeMap(item.DATA_TYPE_NAME), - nullable: item.IS_NULLABLE.toLowerCase() === 'true', - })) - }) - }) - }) - return [ - { - schema: catalog, - name: catalog, - tables - } - ] - }) - } - - /** - * Create HANA schema (catalog) - * - * @param catalog HANA Schema name - * @param options ownedBy: 'SYSTEM' - */ - override async createCatalog( - catalog: string, - options?: { - ownedBy: string - } - ) { - const { ownedBy } = options ?? { ownedBy: 'SYSTEM' } - const schemas = await this.getSchema(catalog) - if (schemas.length === 0) { - await this.runQuery(`CREATE SCHEMA ${catalog} OWNED BY ${ownedBy}`) - } - } - - async ping(): Promise { - await this.runQuery(`SELECT * FROM "DUMMY"`) - } - - async import(params: CreationTable, options?: { catalog?: string }): Promise { - const { name, columns, data, mergeType } = params - - if (!data?.length) { - throw new Error(`data is empty`) - } - - const tableName = `"${name}"` // options?.catalog ? `"${options.catalog}"."${name}"` : - - const createTableStatement = `CREATE COLUMN TABLE ${tableName} (${columns - .map( - (col) => `"${col.fieldName}" ${typeToHANADB(col.type, col.isKey, col.length)}${col.isKey ? ' PRIMARY KEY' : ''}` - ) - .join(', ')} )` - const values = data.map((row) => - columns.map(({ name, type, length, isKey }) => { - const hanaType = typeToHANADB(type, isKey, length) as HANAType - if (row[name] instanceof Date || isDateType(hanaType)) { - return formatDateToHANA(row[name], hanaType) - } else if (type === 'String' || type === 'string') { - return row[name] == null ? null : `${row[name]}` - } else { - return row[name] - } - }) - ) - - try { - if (mergeType === 'DELETE') { - await this.dropTable(name, options) - } - - await this.execute(createTableStatement, options) - - const conn = await this.connect(options) - const stmt = conn.prepare( - `INSERT INTO ${tableName} (${columns.map(({ fieldName }) => `"${fieldName}"`).join(',')}) VALUES(${columns - .map(() => '?') - .join(',')})` - ) - - return new Promise((resolve, reject) => { - stmt.execBatch(values, function (err, rows) { - if (err) { - return reject(err) - } - resolve(rows) - }) - }) - } catch (err: any) { - throw { - message: err.message, - stats: { - statements: [createTableStatement] - } - } - } - - // throw new Error(`Method 'import' of HANA DB adapter not implemented.`) - } - - /** - * Drop table if exists - * @param name Table Name - * @param options - */ - async dropTable(name: string, options?: QueryOptions): Promise { - // Check if table exists - const schemas = await this.getSchema(options.catalog, name) - if (schemas[0]?.tables?.length > 0) { - await this.execute(`DROP TABLE "${name}"`, options) - } - } - - async teardown() { - this.connection.disconnect() - } -} - -register('hana', HANAQueryRunner) - -export function hanaTypeMap(type: string): string { - switch (type?.toLowerCase()) { - case 'decimal': - case 'numeric': - case 'int': - case 'integer': - case 'float': - case 'real': - case 'bigint': - return 'number' - case 'uuid': - case 'nvarchar': - case 'character varying': - return 'string' - case 'timestamp without time zone': - return 'timestamp' - case 'json': - return 'object' - default: - return type - } -} - -export type HANAType = 'INT' | 'DECIMAL' | 'NVARCHAR' | 'DATE' | 'TIME' | 'TIMESTAMP' | 'BOOLEAN' - -function typeToHANADB(type: string, isKey: boolean, length: number) { - switch (type) { - case 'number': - case 'Number': - return 'INT' - case 'Numeric': - return 'DECIMAL' - case 'string': - case 'String': - // Max length 3072 btye for primary key - if (length !== null && length !== undefined) { - return isKey ? `NVARCHAR(${Math.min(length, 768)})` : `NVARCHAR(${length})` - } - return isKey ? 'NVARCHAR(768)' : 'NVARCHAR(1000)' - case 'date': - case 'Date': - return 'DATE' - case 'Time': - return 'TIME' - case 'Datetime': - case 'datetime': - return 'TIMESTAMP' - case 'boolean': - case 'Boolean': - return 'BOOLEAN' - default: - return 'NVARCHAR(1000)' - } -} - -function concatHANAType(type: HANAType, length: number, scale: number) { - if (type === 'DECIMAL') { - return scale ? `${type}(${length},${scale})` : `${type}(${length})` - } else if (type === 'NVARCHAR') { - return `${type}(${length})` - } else { - return type - } -} - -function formatDateToHANA(d: Date | string, type: HANAType) { - const ds = d instanceof Date ? d.toISOString() : d - switch (type) { - case 'DATE': - return ds.slice(0, 10) - case 'TIME': - return ds.slice(11, 19) - case 'TIMESTAMP': - return ds.slice(0, 10) + ' ' + ds.slice(11, 23) - default: - return ds - } -} - -function isDateType(type: HANAType) { - return ['DATE', 'TIME', 'TIMESTAMP'].includes(type) -} \ No newline at end of file +// import { Connection, createConnection } from '@sap/hana-client' +// import { BaseSQLQueryRunner, QueryResult, SQLAdapterOptions, register } from '../base' +// import { groupBy } from '../helpers' +// import { CreationTable, DBProtocolEnum, DBSyntaxEnum, IDSSchema, QueryOptions } from '../types' + +// export interface HANAAdapterOptions extends SQLAdapterOptions { +// database: string +// } + +// export class HANAQueryRunner extends BaseSQLQueryRunner { +// readonly name = 'HANA' +// readonly type = 'hana' +// readonly syntax = DBSyntaxEnum.SQL +// readonly protocol = DBProtocolEnum.SQL + +// readonly jdbcDriver = 'com.sap.db.jdbc.Driver' +// jdbcUrl(schema?: string) { +// return `jdbc:sap://${this.options.host}:${this.options.port}/?databaseName=${this.options.database}¤tSchema=${schema}&user=${encodeURIComponent( +// this.options.username as string +// )}&password=${encodeURIComponent(this.options.password as string)}` +// } + +// get configurationSchema() { +// return { +// type: 'object', +// properties: { +// username: { type: 'string' }, +// password: { type: 'string' }, +// host: { type: 'string' }, +// port: { type: 'number', default: null }, +// database: { type: 'string', title: 'Database/Tenant' }, +// catalog: { type: 'string', title: 'Schema' }, +// // schema: { type: 'string', title: 'Schema' }, +// encoding: { type: 'string' } +// }, +// required: ['username', 'password', 'host', 'port', 'database'], +// order: ['host', 'port', 'username', 'password', 'database', 'catalog'], +// extra_options: ['encoding'], +// secret: ['password'] +// } +// } + +// private connection: Connection + +// constructor(options: HANAAdapterOptions) { +// super(options) + +// this.connection = createConnection() +// } + +// async connect(options?: QueryOptions): Promise { +// const conn_params = { +// serverNode: `${this.options.host}:${this.options.port}`, +// uid: this.options.username, +// pwd: this.options.password, +// currentSchema: options?.catalog, +// databaseName: this.options.database +// } + +// return new Promise((resolve, reject) => { +// if (this.connection.state() === 'connected') { +// resolve(this.connection) +// } else { +// this.connection.connect(conn_params, (err) => { +// if (err) { +// return reject(err) +// } +// resolve(this.connection) +// }) +// } +// }) +// } + +// async execute(query: string, options?: QueryOptions) { +// await this.connect(options) + +// return new Promise((resolve, reject) => { +// this.connection.exec(query, [], (err, result) => { +// if (err) { +// return reject(err) +// } +// this.connection.disconnect() +// resolve(result) +// }) +// }) +// } + +// /** +// * Execute a sql statement in HANA DB +// * +// * @param query sql statement +// * @param options +// * @returns +// */ +// async runQuery(query: string, options?: Record) { +// return this.execute(query, options).then((data: any) => { +// return { +// status: 'OK', +// data +// } as QueryResult +// }) +// } + +// async getCatalogs(): Promise { +// return this.execute(`SELECT * FROM "SYS"."SCHEMAS"`).then((data: any) => { +// return data?.map((item) => ({ +// ...item, +// schema: item.SCHEMA_NAME, +// name: item.SCHEMA_NAME +// })) +// }) +// } + +// override async getSchema(catalog?: string, tableName?: string): Promise { +// let query = '' +// if (tableName) { +// const tableCondition = `A.TABLE_NAME = '${tableName}'` +// const whereCondition = catalog ? `A.SCHEMA_NAME = '${catalog}' AND ${tableCondition}` : tableCondition +// query = `SELECT A.SCHEMA_NAME, A.TABLE_NAME, A.COMMENTS AS TABLE_LABEL, COLUMN_NAME, B.COMMENTS AS COLUMN_LABEL, DATA_TYPE_NAME, LENGTH, SCALE, IS_NULLABLE +// FROM "SYS"."TABLES" AS A JOIN "SYS"."TABLE_COLUMNS" AS B +// ON A.SCHEMA_NAME = B.SCHEMA_NAME AND A.TABLE_NAME = B.TABLE_NAME +// WHERE ${whereCondition} ORDER BY A.SCHEMA_NAME, A.TABLE_NAME, B.POSITION` +// } else { +// query = `SELECT A.SCHEMA_NAME, A.TABLE_NAME, A.COMMENTS AS TABLE_LABEL FROM "SYS"."TABLES" AS A` +// if (catalog) { +// query = query + ` WHERE A.SCHEMA_NAME = '${catalog}'` +// } +// } + +// return this.execute(query).then((data: any) => { +// const tables = [] +// const schemas = groupBy(data, 'SCHEMA_NAME') +// Object.keys(schemas).forEach((database) => { +// const tableGroups = groupBy(schemas[database], 'TABLE_NAME') +// Object.keys(tableGroups).forEach((name) => { +// tables.push({ +// database, +// schema: database, +// name, +// label: tableGroups[name][0].TABLE_LABEL, +// columns: tableGroups[name] +// .filter((item) => item.COLUMN_NAME) +// .map((item) => ({ +// name: item.COLUMN_NAME, +// label: item.COLUMN_LABEL, +// dataType: concatHANAType(item.DATA_TYPE_NAME, item.LENGTH, item.SCALE), +// type: hanaTypeMap(item.DATA_TYPE_NAME), +// nullable: item.IS_NULLABLE.toLowerCase() === 'true', +// })) +// }) +// }) +// }) +// return [ +// { +// schema: catalog, +// name: catalog, +// tables +// } +// ] +// }) +// } + +// /** +// * Create HANA schema (catalog) +// * +// * @param catalog HANA Schema name +// * @param options ownedBy: 'SYSTEM' +// */ +// override async createCatalog( +// catalog: string, +// options?: { +// ownedBy: string +// } +// ) { +// const { ownedBy } = options ?? { ownedBy: 'SYSTEM' } +// const schemas = await this.getSchema(catalog) +// if (schemas.length === 0) { +// await this.runQuery(`CREATE SCHEMA ${catalog} OWNED BY ${ownedBy}`) +// } +// } + +// async ping(): Promise { +// await this.runQuery(`SELECT * FROM "DUMMY"`) +// } + +// async import(params: CreationTable, options?: { catalog?: string }): Promise { +// const { name, columns, data, mergeType } = params + +// if (!data?.length) { +// throw new Error(`data is empty`) +// } + +// const tableName = `"${name}"` // options?.catalog ? `"${options.catalog}"."${name}"` : + +// const createTableStatement = `CREATE COLUMN TABLE ${tableName} (${columns +// .map( +// (col) => `"${col.fieldName}" ${typeToHANADB(col.type, col.isKey, col.length)}${col.isKey ? ' PRIMARY KEY' : ''}` +// ) +// .join(', ')} )` +// const values = data.map((row) => +// columns.map(({ name, type, length, isKey }) => { +// const hanaType = typeToHANADB(type, isKey, length) as HANAType +// if (row[name] instanceof Date || isDateType(hanaType)) { +// return formatDateToHANA(row[name], hanaType) +// } else if (type === 'String' || type === 'string') { +// return row[name] == null ? null : `${row[name]}` +// } else { +// return row[name] +// } +// }) +// ) + +// try { +// if (mergeType === 'DELETE') { +// await this.dropTable(name, options) +// } + +// await this.execute(createTableStatement, options) + +// const conn = await this.connect(options) +// const stmt = conn.prepare( +// `INSERT INTO ${tableName} (${columns.map(({ fieldName }) => `"${fieldName}"`).join(',')}) VALUES(${columns +// .map(() => '?') +// .join(',')})` +// ) + +// return new Promise((resolve, reject) => { +// stmt.execBatch(values, function (err, rows) { +// if (err) { +// return reject(err) +// } +// resolve(rows) +// }) +// }) +// } catch (err: any) { +// throw { +// message: err.message, +// stats: { +// statements: [createTableStatement] +// } +// } +// } + +// // throw new Error(`Method 'import' of HANA DB adapter not implemented.`) +// } + +// /** +// * Drop table if exists +// * @param name Table Name +// * @param options +// */ +// async dropTable(name: string, options?: QueryOptions): Promise { +// // Check if table exists +// const schemas = await this.getSchema(options.catalog, name) +// if (schemas[0]?.tables?.length > 0) { +// await this.execute(`DROP TABLE "${name}"`, options) +// } +// } + +// async teardown() { +// this.connection.disconnect() +// } +// } + +// register('hana', HANAQueryRunner) + +// export function hanaTypeMap(type: string): string { +// switch (type?.toLowerCase()) { +// case 'decimal': +// case 'numeric': +// case 'int': +// case 'integer': +// case 'float': +// case 'real': +// case 'bigint': +// return 'number' +// case 'uuid': +// case 'nvarchar': +// case 'character varying': +// return 'string' +// case 'timestamp without time zone': +// return 'timestamp' +// case 'json': +// return 'object' +// default: +// return type +// } +// } + +// export type HANAType = 'INT' | 'DECIMAL' | 'NVARCHAR' | 'DATE' | 'TIME' | 'TIMESTAMP' | 'BOOLEAN' + +// function typeToHANADB(type: string, isKey: boolean, length: number) { +// switch (type) { +// case 'number': +// case 'Number': +// return 'INT' +// case 'Numeric': +// return 'DECIMAL' +// case 'string': +// case 'String': +// // Max length 3072 btye for primary key +// if (length !== null && length !== undefined) { +// return isKey ? `NVARCHAR(${Math.min(length, 768)})` : `NVARCHAR(${length})` +// } +// return isKey ? 'NVARCHAR(768)' : 'NVARCHAR(1000)' +// case 'date': +// case 'Date': +// return 'DATE' +// case 'Time': +// return 'TIME' +// case 'Datetime': +// case 'datetime': +// return 'TIMESTAMP' +// case 'boolean': +// case 'Boolean': +// return 'BOOLEAN' +// default: +// return 'NVARCHAR(1000)' +// } +// } + +// function concatHANAType(type: HANAType, length: number, scale: number) { +// if (type === 'DECIMAL') { +// return scale ? `${type}(${length},${scale})` : `${type}(${length})` +// } else if (type === 'NVARCHAR') { +// return `${type}(${length})` +// } else { +// return type +// } +// } + +// function formatDateToHANA(d: Date | string, type: HANAType) { +// const ds = d instanceof Date ? d.toISOString() : d +// switch (type) { +// case 'DATE': +// return ds.slice(0, 10) +// case 'TIME': +// return ds.slice(11, 19) +// case 'TIMESTAMP': +// return ds.slice(0, 10) + ' ' + ds.slice(11, 23) +// default: +// return ds +// } +// } + +// function isDateType(type: HANAType) { +// return ['DATE', 'TIME', 'TIMESTAMP'].includes(type) +// } \ No newline at end of file diff --git a/packages/adapter/src/index.ts b/packages/adapter/src/index.ts index 8019ae599..12d45fa9f 100644 --- a/packages/adapter/src/index.ts +++ b/packages/adapter/src/index.ts @@ -5,7 +5,7 @@ export * from './adapters/postgres/index' export * from './adapters/presto' export * from './adapters/redshift' export * from './adapters/sap-bw' -export * from './adapters/sap-hana' +// export * from './adapters/sap-hana' export * from './adapters/trino' export * from './adapters/xmla' export * from './base' From 2d6603adda8c1bef73372893b212f8b31b02ce59 Mon Sep 17 00:00:00 2001 From: meta-d Date: Thu, 5 Dec 2024 15:34:56 +0800 Subject: [PATCH 07/11] feat: builtx --- .../workflows/docker-build-publish-demo.yml | 53 ++++++++++++++----- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/.github/workflows/docker-build-publish-demo.yml b/.github/workflows/docker-build-publish-demo.yml index 635e12871..b5d2b8929 100644 --- a/.github/workflows/docker-build-publish-demo.yml +++ b/.github/workflows/docker-build-publish-demo.yml @@ -56,6 +56,7 @@ jobs: context: . file: ${{ matrix.service.context }}/Dockerfile platforms: ${{ matrix.platform }} + build-args: COMMIT_SHA=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }} tags: | ghcr.io/xpert-ai/${{ matrix.service.image_name }}:latest metadc/${{ matrix.service.image_name }}:latest @@ -63,6 +64,21 @@ jobs: cache-from: type=gha cache-to: type=gha,mode=max labels: ${{ steps.meta.outputs.labels }} + outputs: type=image,name=metadc/${{ matrix.service.image_name }},push-by-digest=true,name-canonical=true,push=true + + - name: Export digest + run: | + mkdir -p /tmp/digests + digest="${{ steps.build.outputs.digest }}" + touch "/tmp/digests/${digest#sha256:}" + + - name: Upload digest + uses: actions/upload-artifact@v4 + with: + name: digests-${{ matrix.service.name }}-${{ matrix.platform }} + path: /tmp/digests/* + if-no-files-found: error + retention-days: 1 create-manifest: needs: build @@ -75,25 +91,36 @@ jobs: environment: production steps: + - name: Download digests + uses: actions/download-artifact@v4 + with: + path: /tmp/digests + pattern: digests-${{ matrix.service.name }}-* + merge-multiple: true + - name: Login to DockerHub uses: docker/login-action@v3.2.0 with: username: ${{ env.DOCKERHUB_USERNAME }} password: ${{ env.DOCKERHUB_TOKEN }} - - name: Create and Push Multi-Platform Manifest - uses: docker/manifest-create-action@v1 + - name: Extract metadata for Docker + id: meta + uses: docker/metadata-action@v5 with: - image: | - ghcr.io/xpert-ai/${{ matrix.service.image_name }}:latest - metadc/${{ matrix.service.image_name }}:latest - registry.cn-hangzhou.aliyuncs.com/metad/${{ matrix.service.image_name }}:latest - platforms: | - linux/amd64 - linux/arm64 + images: metadc/${{ matrix.service.image_name }} + tags: | + type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') && !contains(github.ref, '-') }} + type=ref,event=branch + type=sha,enable=true,priority=100,prefix=,suffix=,format=long + type=raw,value=${{ github.ref_name }},enable=${{ startsWith(github.ref, 'refs/tags/') }} + + - name: Create manifest list and push + working-directory: /tmp/digests + run: | + docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + $(printf 'metadc/${{ matrix.service.image_name }}@sha256:%s ' *) - - name: Push Manifest to Docker Registries + - name: Inspect image run: | - docker push ghcr.io/xpert-ai/${{ matrix.service.image_name }}:latest - docker push metadc/${{ matrix.service.image_name }}:latest - docker push registry.cn-hangzhou.aliyuncs.com/metad/${{ matrix.service.image_name }}:latest + docker buildx imagetools inspect metadc/${{ matrix.service.image_name }}:${{ steps.meta.outputs.version }} From 0c52d5fe77cc1622e751b5a7fb64056b59cf357e Mon Sep 17 00:00:00 2001 From: meta-d Date: Thu, 5 Dec 2024 15:45:03 +0800 Subject: [PATCH 08/11] fix: remove ghcr --- .github/workflows/docker-build-publish-demo.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/docker-build-publish-demo.yml b/.github/workflows/docker-build-publish-demo.yml index b5d2b8929..6467ccf5d 100644 --- a/.github/workflows/docker-build-publish-demo.yml +++ b/.github/workflows/docker-build-publish-demo.yml @@ -58,9 +58,7 @@ jobs: platforms: ${{ matrix.platform }} build-args: COMMIT_SHA=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }} tags: | - ghcr.io/xpert-ai/${{ matrix.service.image_name }}:latest metadc/${{ matrix.service.image_name }}:latest - registry.cn-hangzhou.aliyuncs.com/metad/${{ matrix.service.image_name }}:latest cache-from: type=gha cache-to: type=gha,mode=max labels: ${{ steps.meta.outputs.labels }} From f10a872f1c246da3611df21956875737a7cd91d0 Mon Sep 17 00:00:00 2001 From: meta-d Date: Thu, 5 Dec 2024 15:49:27 +0800 Subject: [PATCH 09/11] feat: add image_name --- .github/workflows/docker-build-publish-demo.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-build-publish-demo.yml b/.github/workflows/docker-build-publish-demo.yml index 6467ccf5d..dbc4a2204 100644 --- a/.github/workflows/docker-build-publish-demo.yml +++ b/.github/workflows/docker-build-publish-demo.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: service: - - { name: "xpert-api", context: ".deploy/api", image_name: "xpert-api-demo" } + - { name: "xpert-api", context: ".deploy/api", image_name: "metadc/xpert-api-demo" } # - { name: "xpert-webapp", context: ".deploy/webapp", image_name: "xpert-webapp-demo" } platform: [ "linux/amd64", "linux/arm64" ] environment: production @@ -46,9 +46,7 @@ jobs: uses: docker/metadata-action@v5 with: images: | - ghcr.io/xpert-ai/${{ matrix.service.image_name }} - metadc/${{ matrix.service.image_name }} - registry.cn-hangzhou.aliyuncs.com/metad/${{ matrix.service.image_name }} + ${{ matrix.service.image_name }} - name: Build and Push Docker Images uses: docker/build-push-action@v6 @@ -58,11 +56,11 @@ jobs: platforms: ${{ matrix.platform }} build-args: COMMIT_SHA=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }} tags: | - metadc/${{ matrix.service.image_name }}:latest + ${{ matrix.service.image_name }}:latest cache-from: type=gha cache-to: type=gha,mode=max labels: ${{ steps.meta.outputs.labels }} - outputs: type=image,name=metadc/${{ matrix.service.image_name }},push-by-digest=true,name-canonical=true,push=true + outputs: type=image,name=${{ matrix.service.image_name }},push-by-digest=true,name-canonical=true,push=true - name: Export digest run: | From 5dfb076e556ceef3dd89ac3ae45a51f780610696 Mon Sep 17 00:00:00 2001 From: meta-d Date: Thu, 5 Dec 2024 16:17:19 +0800 Subject: [PATCH 10/11] feat: restore demo action --- .../workflows/docker-build-publish-demo.yml | 198 +++++++++--------- 1 file changed, 98 insertions(+), 100 deletions(-) diff --git a/.github/workflows/docker-build-publish-demo.yml b/.github/workflows/docker-build-publish-demo.yml index dbc4a2204..c419c29d5 100644 --- a/.github/workflows/docker-build-publish-demo.yml +++ b/.github/workflows/docker-build-publish-demo.yml @@ -1,4 +1,4 @@ -name: Docker Images Multi-Platform +name: Build and Publish Docker Images Demo on: push: @@ -10,113 +10,111 @@ permissions: contents: read packages: write -env: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - ACR_USERNAME: ${{ secrets.ACR_USERNAME }} - ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }} - jobs: - build: + + xpert-api: + runs-on: ubuntu-latest - strategy: - matrix: - service: - - { name: "xpert-api", context: ".deploy/api", image_name: "metadc/xpert-api-demo" } - # - { name: "xpert-webapp", context: ".deploy/webapp", image_name: "xpert-webapp-demo" } - platform: [ "linux/amd64", "linux/arm64" ] environment: production steps: - - uses: actions/checkout@v4 - - - name: Login to DockerHub - uses: docker/login-action@v3.2.0 - with: - username: ${{ env.DOCKERHUB_USERNAME }} - password: ${{ env.DOCKERHUB_TOKEN }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Extract metadata for Docker - id: meta - uses: docker/metadata-action@v5 - with: - images: | - ${{ matrix.service.image_name }} - - - name: Build and Push Docker Images - uses: docker/build-push-action@v6 - with: + - uses: actions/checkout@v4 + - name: Build + uses: docker/build-push-action@v6.3.0 + with: context: . - file: ${{ matrix.service.context }}/Dockerfile - platforms: ${{ matrix.platform }} - build-args: COMMIT_SHA=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }} + file: ./.deploy/api/Dockerfile + load: true + platforms: linux/amd64 tags: | - ${{ matrix.service.image_name }}:latest - cache-from: type=gha - cache-to: type=gha,mode=max - labels: ${{ steps.meta.outputs.labels }} - outputs: type=image,name=${{ matrix.service.image_name }},push-by-digest=true,name-canonical=true,push=true + ghcr.io/xpert-ai/xpert-api-demo:latest + metadc/xpert-api-demo:latest + registry.cn-hangzhou.aliyuncs.com/metad/xpert-api-demo:latest + cache-from: type=registry,ref=metadc/xpert-api-demo:latest + cache-to: type=inline + - name: Docker images list + run: | + sudo docker image list + + - name: Login to DockerHub + uses: docker/login-action@v3.2.0 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Push to Docker Hub Registry + run: | + docker push metadc/xpert-api-demo:latest + + - name: Login to GitHub Container Registry + uses: docker/login-action@v3.2.0 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Push to Github Registry + run: | + docker push ghcr.io/xpert-ai/xpert-api-demo:latest + + - uses: aliyun/acr-login@v1 + with: + login-server: https://registry.cn-hangzhou.aliyuncs.com + username: "${{ secrets.ACR_USERNAME }}" + password: "${{ secrets.ACR_PASSWORD }}" + + - name: Push to Aliyun Registry + run: | + docker push registry.cn-hangzhou.aliyuncs.com/metad/xpert-api-demo:latest + + xpert-webapp: - - name: Export digest - run: | - mkdir -p /tmp/digests - digest="${{ steps.build.outputs.digest }}" - touch "/tmp/digests/${digest#sha256:}" - - - name: Upload digest - uses: actions/upload-artifact@v4 - with: - name: digests-${{ matrix.service.name }}-${{ matrix.platform }} - path: /tmp/digests/* - if-no-files-found: error - retention-days: 1 - - create-manifest: - needs: build runs-on: ubuntu-latest - strategy: - matrix: - service: - - { name: "xpert-api", image_name: "xpert-api-demo" } - # - { name: "xpert-webapp", image_name: "xpert-webapp-demo" } environment: production - steps: - - name: Download digests - uses: actions/download-artifact@v4 - with: - path: /tmp/digests - pattern: digests-${{ matrix.service.name }}-* - merge-multiple: true - - - name: Login to DockerHub - uses: docker/login-action@v3.2.0 - with: - username: ${{ env.DOCKERHUB_USERNAME }} - password: ${{ env.DOCKERHUB_TOKEN }} - - - name: Extract metadata for Docker - id: meta - uses: docker/metadata-action@v5 - with: - images: metadc/${{ matrix.service.image_name }} + - uses: actions/checkout@v4 + - name: Build + uses: docker/build-push-action@v6.3.0 + with: + context: . + file: ./.deploy/webapp/Dockerfile + load: true + platforms: linux/amd64 tags: | - type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') && !contains(github.ref, '-') }} - type=ref,event=branch - type=sha,enable=true,priority=100,prefix=,suffix=,format=long - type=raw,value=${{ github.ref_name }},enable=${{ startsWith(github.ref, 'refs/tags/') }} - - - name: Create manifest list and push - working-directory: /tmp/digests - run: | - docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ - $(printf 'metadc/${{ matrix.service.image_name }}@sha256:%s ' *) - - - name: Inspect image - run: | - docker buildx imagetools inspect metadc/${{ matrix.service.image_name }}:${{ steps.meta.outputs.version }} + ghcr.io/xpert-ai/xpert-webapp-demo:latest + metadc/xpert-webapp-demo:latest + registry.cn-hangzhou.aliyuncs.com/metad/xpert-webapp-demo:latest + cache-from: type=registry,ref=metadc/xpert-webapp-demo:latest + cache-to: type=inline + - name: Docker images list + run: | + sudo docker image list + - name: Login to DockerHub + uses: docker/login-action@v3.2.0 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Push to Docker Hub Registry + run: | + docker push metadc/xpert-webapp-demo:latest + + - name: Login to GitHub Container Registry + uses: docker/login-action@v3.2.0 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Push to Github Registry + run: | + docker push ghcr.io/xpert-ai/xpert-webapp-demo:latest + + - uses: aliyun/acr-login@v1 + with: + login-server: https://registry.cn-hangzhou.aliyuncs.com + username: "${{ secrets.ACR_USERNAME }}" + password: "${{ secrets.ACR_PASSWORD }}" + + - name: Push to Aliyun Registry + run: | + docker push registry.cn-hangzhou.aliyuncs.com/metad/xpert-webapp-demo:latest \ No newline at end of file From b5b4d31d0c93f30359b1fe76267b22cc243fec0b Mon Sep 17 00:00:00 2001 From: meta-d Date: Thu, 5 Dec 2024 16:26:48 +0800 Subject: [PATCH 11/11] fix: github action environment --- .github/workflows/publish-npm-packages.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish-npm-packages.yml b/.github/workflows/publish-npm-packages.yml index 73e55b95f..6c3639099 100644 --- a/.github/workflows/publish-npm-packages.yml +++ b/.github/workflows/publish-npm-packages.yml @@ -15,8 +15,7 @@ jobs: publish: runs-on: ubuntu-latest if: github.event_name == 'push' && !contains(github.ref, 'beta') - environment: - name: prod + environment: production steps: - uses: actions/checkout@v4 with: @@ -55,8 +54,7 @@ jobs: publish-beta: runs-on: ubuntu-latest if: github.event_name == 'push' && contains(github.ref, 'beta') - environment: - name: prod + environment: production steps: - uses: actions/checkout@v4 with: