diff --git a/servers/fdr/prisma/migrations/20240415002406_add_version_to_sdk/migration.sql b/servers/fdr/prisma/migrations/20240415002406_add_version_to_sdk/migration.sql new file mode 100644 index 0000000000..c6bc330079 --- /dev/null +++ b/servers/fdr/prisma/migrations/20240415002406_add_version_to_sdk/migration.sql @@ -0,0 +1,2 @@ +-- AlterTable +ALTER TABLE "Sdk" ADD COLUMN "version" TEXT; diff --git a/servers/fdr/prisma/schema.prisma b/servers/fdr/prisma/schema.prisma index 23e80283e2..015b64cf79 100644 --- a/servers/fdr/prisma/schema.prisma +++ b/servers/fdr/prisma/schema.prisma @@ -86,6 +86,8 @@ model Sdk { // Optional for backcompat // Package name used by registry (e.g. @velllum/api or com.vellum.ai:vellum) package String? + // Optional for backcompat + version String? language Language sdk Bytes createdAt DateTime @default(now()) diff --git a/servers/fdr/src/db/sdk/SdkDao.ts b/servers/fdr/src/db/sdk/SdkDao.ts index c8651b90f3..3da2cee2b1 100644 --- a/servers/fdr/src/db/sdk/SdkDao.ts +++ b/servers/fdr/src/db/sdk/SdkDao.ts @@ -98,16 +98,6 @@ export class SdkDaoImpl implements SdkDao { case Language.RUBY: id = SdkIdFactory.fromRuby({ gem: sdkPackage, version }); break; - case Language.JAVA: { - // TODO(armandobelardo): confirm how to do java here - const splitCoord = sdkPackage.split(":"); - if (splitCoord.length === 2) { - const group = sdkPackage.split(":")[0]; - const artifact = sdkPackage.split(":")[1]; - id = SdkIdFactory.fromJava({ group, artifact, version }); - } - break; - } default: break; } @@ -122,6 +112,7 @@ export class SdkDaoImpl implements SdkDao { }, where: { package: sdkPackage, + version, language, }, orderBy: { diff --git a/servers/fdr/src/db/snippets/SnippetsDao.ts b/servers/fdr/src/db/snippets/SnippetsDao.ts index 5f873d417d..d4c99a2a1f 100644 --- a/servers/fdr/src/db/snippets/SnippetsDao.ts +++ b/servers/fdr/src/db/snippets/SnippetsDao.ts @@ -226,6 +226,7 @@ export class SnippetsDaoImpl implements SnippetsDao { data: { id: sdkInfo.id, package: getPackageNameFromSdkSnippetsCreate(storeSnippetsInfo.sdk), + version: storeSnippetsInfo.sdk.sdk.version, language: sdkInfo.language, sdk: writeBuffer(storeSnippetsInfo.sdk.sdk), },