From c772e263173c04533a70f1e2cae54ea89ee7961d Mon Sep 17 00:00:00 2001 From: Tom Frenken Date: Tue, 13 Aug 2024 15:20:30 +0200 Subject: [PATCH] refactor structure and generation script --- packages/ai-core/package.json | 2 +- .../{client/AI_CORE_API => tests}/artifact-api.test.ts | 8 ++++---- .../AI_CORE_API => tests}/configuration-api.test.ts | 4 ++-- .../{client/AI_CORE_API => tests}/deployment-api.test.ts | 4 ++-- .../{client/AI_CORE_API => tests}/execution-api.test.ts | 4 ++-- .../{client/AI_CORE_API => tests}/scenario-api.test.ts | 4 ++-- packages/gen-ai-hub/package.json | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) rename packages/ai-core/src/{client/AI_CORE_API => tests}/artifact-api.test.ts (91%) rename packages/ai-core/src/{client/AI_CORE_API => tests}/configuration-api.test.ts (95%) rename packages/ai-core/src/{client/AI_CORE_API => tests}/deployment-api.test.ts (97%) rename packages/ai-core/src/{client/AI_CORE_API => tests}/execution-api.test.ts (95%) rename packages/ai-core/src/{client/AI_CORE_API => tests}/scenario-api.test.ts (89%) diff --git a/packages/ai-core/package.json b/packages/ai-core/package.json index f2aa0021..201f4a06 100644 --- a/packages/ai-core/package.json +++ b/packages/ai-core/package.json @@ -21,7 +21,7 @@ "test": "NODE_OPTIONS=--experimental-vm-modules jest", "lint": "eslint . && prettier . --config ../../.prettierrc --ignore-path ../../.prettierignore -c", "lint:fix": "eslint . --fix && prettier . --config ../../.prettierrc --ignore-path ../../.prettierignore -w --log-level error", - "generate": "openapi-generator --generateESM --overwrite --input ./src/spec/AI_CORE_API.yaml --outputDir ./src/client && pnpm lint:fix" + "generate": "openapi-generator --generateESM --clearOutputDir -i ./src/spec/AI_CORE_API.yaml -o ./src/client && pnpm lint:fix" }, "dependencies": { "@sap-cloud-sdk/openapi": "^3.18.0" diff --git a/packages/ai-core/src/client/AI_CORE_API/artifact-api.test.ts b/packages/ai-core/src/tests/artifact-api.test.ts similarity index 91% rename from packages/ai-core/src/client/AI_CORE_API/artifact-api.test.ts rename to packages/ai-core/src/tests/artifact-api.test.ts index 082cd4e0..ccfff66f 100644 --- a/packages/ai-core/src/client/AI_CORE_API/artifact-api.test.ts +++ b/packages/ai-core/src/tests/artifact-api.test.ts @@ -4,8 +4,8 @@ import { AiArtifactCreationResponse, AiArtifactList, AiArtifactPostData -} from './schema/index.js'; -import { ArtifactApi } from './artifact-api.js'; +} from '../client/AI_CORE_API/schema/index.js'; +import { ArtifactApi } from '../client/AI_CORE_API/artifact-api.js'; describe('artifact', () => { const destination: HttpDestination = { @@ -68,7 +68,7 @@ describe('artifact', () => { 'Content-Type': 'application/json' }); - const AiArtifactPostData: AiArtifactPostData = { + const aiArtifactPostData: AiArtifactPostData = { description: 'dataset for training test', kind: 'dataset', name: 'training-test-data', @@ -77,7 +77,7 @@ describe('artifact', () => { }; const result: AiArtifactCreationResponse = await ArtifactApi.artifactCreate( - AiArtifactPostData, + aiArtifactPostData, { 'AI-Resource-Group': 'default' } ).execute(destination); diff --git a/packages/ai-core/src/client/AI_CORE_API/configuration-api.test.ts b/packages/ai-core/src/tests/configuration-api.test.ts similarity index 95% rename from packages/ai-core/src/client/AI_CORE_API/configuration-api.test.ts rename to packages/ai-core/src/tests/configuration-api.test.ts index 4be1b616..d99b270a 100644 --- a/packages/ai-core/src/client/AI_CORE_API/configuration-api.test.ts +++ b/packages/ai-core/src/tests/configuration-api.test.ts @@ -4,8 +4,8 @@ import { AiConfigurationBaseData, AiConfigurationCreationResponse, AiConfigurationList -} from './schema/index.js'; -import { ConfigurationApi } from './configuration-api.js'; +} from '../client/AI_CORE_API/schema/index.js'; +import { ConfigurationApi } from '../client/AI_CORE_API/configuration-api.js'; describe('configuration', () => { const destination: HttpDestination = { diff --git a/packages/ai-core/src/client/AI_CORE_API/deployment-api.test.ts b/packages/ai-core/src/tests/deployment-api.test.ts similarity index 97% rename from packages/ai-core/src/client/AI_CORE_API/deployment-api.test.ts rename to packages/ai-core/src/tests/deployment-api.test.ts index bbd9c001..7bdefcd9 100644 --- a/packages/ai-core/src/client/AI_CORE_API/deployment-api.test.ts +++ b/packages/ai-core/src/tests/deployment-api.test.ts @@ -8,8 +8,8 @@ import { AiDeploymentModificationRequest, AiDeploymentModificationResponse, AiDeploymentTargetStatus -} from './schema/index.js'; -import { DeploymentApi } from './deployment-api.js'; +} from '../client/AI_CORE_API/schema/index.js'; +import { DeploymentApi } from '../client/AI_CORE_API/deployment-api.js'; describe('deployment', () => { const destination: HttpDestination = { diff --git a/packages/ai-core/src/client/AI_CORE_API/execution-api.test.ts b/packages/ai-core/src/tests/execution-api.test.ts similarity index 95% rename from packages/ai-core/src/client/AI_CORE_API/execution-api.test.ts rename to packages/ai-core/src/tests/execution-api.test.ts index 0098d816..581d8479 100644 --- a/packages/ai-core/src/client/AI_CORE_API/execution-api.test.ts +++ b/packages/ai-core/src/tests/execution-api.test.ts @@ -4,8 +4,8 @@ import { AiEnactmentCreationRequest, AiExecutionCreationResponse, AiExecutionList -} from './schema/index.js'; -import { ExecutionApi } from './execution-api.js'; +} from '../client/AI_CORE_API/schema/index.js'; +import { ExecutionApi } from '../client/AI_CORE_API/execution-api.js'; describe('execution', () => { const destination: HttpDestination = { diff --git a/packages/ai-core/src/client/AI_CORE_API/scenario-api.test.ts b/packages/ai-core/src/tests/scenario-api.test.ts similarity index 89% rename from packages/ai-core/src/client/AI_CORE_API/scenario-api.test.ts rename to packages/ai-core/src/tests/scenario-api.test.ts index 44572804..b3926c7b 100644 --- a/packages/ai-core/src/client/AI_CORE_API/scenario-api.test.ts +++ b/packages/ai-core/src/tests/scenario-api.test.ts @@ -1,7 +1,7 @@ import nock from 'nock'; import { HttpDestination } from '@sap-cloud-sdk/connectivity'; -import { AiScenarioList } from './schema/index.js'; -import { ScenarioApi } from './scenario-api.js'; +import { ScenarioApi } from '../client/AI_CORE_API/scenario-api.js'; +import { AiScenarioList } from '../client/AI_CORE_API/schema/index.js'; describe('scenario', () => { const destination: HttpDestination = { diff --git a/packages/gen-ai-hub/package.json b/packages/gen-ai-hub/package.json index 35bdd898..c5e8d780 100644 --- a/packages/gen-ai-hub/package.json +++ b/packages/gen-ai-hub/package.json @@ -24,7 +24,7 @@ "lint": "eslint . && prettier . --config ../../.prettierrc --ignore-path ../../.prettierignore -c", "lint:fix": "eslint . --fix && prettier . --config ../../.prettierrc --ignore-path ../../.prettierignore -w --log-level error", "generate": "pnpm generate:orchestration", - "generate:orchestration": "openapi-generator --overwrite --generateESM -i ./src/orchestration/spec/api.yaml -o ./src/orchestration/client && pnpm lint:fix" + "generate:orchestration": "openapi-generator --generateESM --clearOutputDir -i ./src/orchestration/spec/api.yaml -o ./src/orchestration/client && pnpm lint:fix" }, "dependencies": { "@sap-ai-sdk/core": "workspace:^",