@red-hat-developer-hub/backstage-plugin-catalog-backend-module-model-catalog 0.9.0 → 0.10.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @red-hat-developer-hub/backstage-plugin-catalog-backend-module-model-catalog
 
+## 0.10.0
+
+### Minor Changes
+
+- 56c40be: Integrate Backstage discovery and auth services for connector communication.
+
+  The model-catalog entity provider now resolves the connector base URL via the
+  discovery service and authenticates with backend-to-backend service tokens
+  instead of unauthenticated direct HTTP calls. The `fromConfig` factory method
+  accepts `discovery` and `auth` as additional required dependencies.
+
+  The techdoc URL reader adds bearer-token authentication when fetching model
+  cards and replaces hostname-based bridge URL matching with path-based matching
+  that uses the connector plugin ID.
+
+### Patch Changes
+
+- c2e3749: bump workspace to 1.52.0
+
+## 0.9.1
+
+### Patch Changes
+
+- 4418084: Upgrade workspace to Backstage 1.49.4
+
 ## 0.9.0
 
 ### Minor Changes

package/dist/clients/BridgeResourceConnector.cjs.js

@@ -1,8 +1,12 @@
 'use strict';
 
-async function fetchModelCatalogKeys(baseUrl) {
+async function fetchModelCatalogKeys(baseUrl, token) {
   const res = await fetch(`${baseUrl}/list`, {
-    method: "GET"
+    method: "GET",
+    headers: {
+      Authorization: `Bearer ${token.token}`,
+      "Content-Type": "application/json"
+    }
   });
   if (!res.ok) {
     throw new Error(res.statusText);
@@ -10,9 +14,19 @@ async function fetchModelCatalogKeys(baseUrl) {
   const modelCatalogKeys = await res.json();
   return modelCatalogKeys.uris;
 }
-async function fetchModelCatalogFromKey(baseUrl, modelCatalogKey) {
-  const res = await fetch(`${baseUrl}${modelCatalogKey}`, {
-    method: "GET"
+async function fetchModelCatalogFromKey(baseUrl, modelCatalogKey, token) {
+  let tok = "";
+  if (token) {
+    tok = token?.token;
+  }
+  const url = `${baseUrl}/models/${modelCatalogKey}`;
+  console.log(`Fetching model catalog key ${url}`);
+  const res = await fetch(url, {
+    method: "GET",
+    headers: {
+      Authorization: `Bearer ${tok}`,
+      "Content-Type": "application/json"
+    }
   });
   if (!res.ok) {
     throw new Error(res.statusText);

package/dist/clients/BridgeResourceConnector.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"BridgeResourceConnector.cjs.js","sources":["../../src/clients/BridgeResourceConnector.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { ModelCatalog } from '@redhat-ai-dev/model-catalog-types';\n\n/**\n * ModelCatalogKeys is the object used by the bridge to return the list of keys corresponding to each model catalog entry in the bridge\n * @public\n */\nexport interface ModelCatalogKeys {\n  uris: string[];\n}\n\n/**\n * fetchModelCatalogKeys retrieves the keys for each of the model catalog entries in the model catalog bridge service\n * @public\n */\nexport async function fetchModelCatalogKeys(\n  baseUrl: string,\n): Promise<string[]> {\n  // ToDo: Discover catalog-info endpoint?\n  const res = await fetch(`${baseUrl}/list`, {\n    method: 'GET',\n  });\n\n  if (!res.ok) {\n    throw new Error(res.statusText);\n  }\n\n  const modelCatalogKeys: ModelCatalogKeys = await res.json();\n  return modelCatalogKeys.uris;\n}\n\n/**\n * fetchModelCatalogFromKey fetches a model catalog JSON object from the bridge based on a given key\n * @public\n */\nexport async function fetchModelCatalogFromKey(\n  baseUrl: string,\n  modelCatalogKey: string,\n): Promise<ModelCatalog> {\n  const res = await fetch(`${baseUrl}${modelCatalogKey}`, {\n    method: 'GET',\n  });\n\n  if (!res.ok) {\n    throw new Error(res.statusText);\n  }\n\n  const modelCatalog: ModelCatalog = await res.json();\n  return modelCatalog;\n}\n"],"names":[],"mappings":";;AA6BA,eAAsB,sBACpB,OACmB,EAAA;AAEnB,EAAA,MAAM,GAAM,GAAA,MAAM,KAAM,CAAA,CAAA,EAAG,OAAO,CAAS,KAAA,CAAA,EAAA;AAAA,IACzC,MAAQ,EAAA;AAAA,GACT,CAAA;AAED,EAAI,IAAA,CAAC,IAAI,EAAI,EAAA;AACX,IAAM,MAAA,IAAI,KAAM,CAAA,GAAA,CAAI,UAAU,CAAA;AAAA;AAGhC,EAAM,MAAA,gBAAA,GAAqC,MAAM,GAAA,CAAI,IAAK,EAAA;AAC1D,EAAA,OAAO,gBAAiB,CAAA,IAAA;AAC1B;AAMsB,eAAA,wBAAA,CACpB,SACA,eACuB,EAAA;AACvB,EAAA,MAAM,MAAM,MAAM,KAAA,CAAM,GAAG,OAAO,CAAA,EAAG,eAAe,CAAI,CAAA,EAAA;AAAA,IACtD,MAAQ,EAAA;AAAA,GACT,CAAA;AAED,EAAI,IAAA,CAAC,IAAI,EAAI,EAAA;AACX,IAAM,MAAA,IAAI,KAAM,CAAA,GAAA,CAAI,UAAU,CAAA;AAAA;AAGhC,EAAM,MAAA,YAAA,GAA6B,MAAM,GAAA,CAAI,IAAK,EAAA;AAClD,EAAO,OAAA,YAAA;AACT;;;;;"}
+{"version":3,"file":"BridgeResourceConnector.cjs.js","sources":["../../src/clients/BridgeResourceConnector.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { ModelCatalog } from '@redhat-ai-dev/model-catalog-types';\n\n/**\n * ModelCatalogKeys is the object used by the bridge to return the list of keys corresponding to each model catalog entry in the bridge\n * @public\n */\nexport interface ModelCatalogKeys {\n  uris: string[];\n}\n\n/**\n * fetchModelCatalogKeys retrieves the keys for each of the model catalog entries in the model catalog bridge service\n * @public\n */\nexport async function fetchModelCatalogKeys(\n  baseUrl: string,\n  token: { token: string },\n): Promise<string[]> {\n  const res = await fetch(`${baseUrl}/list`, {\n    method: 'GET',\n    headers: {\n      Authorization: `Bearer ${token.token}`,\n      'Content-Type': 'application/json',\n    },\n  });\n\n  if (!res.ok) {\n    throw new Error(res.statusText);\n  }\n\n  const modelCatalogKeys: ModelCatalogKeys = await res.json();\n  return modelCatalogKeys.uris;\n}\n\n/**\n * fetchModelCatalogFromKey fetches a model catalog JSON object from the bridge based on a given key\n * @public\n */\nexport async function fetchModelCatalogFromKey(\n  baseUrl: string,\n  modelCatalogKey: string,\n  token?: { token: string },\n): Promise<ModelCatalog> {\n  let tok = '';\n  if (token) {\n    tok = token?.token;\n  }\n  const url = `${baseUrl}/models/${modelCatalogKey}`;\n  console.log(`Fetching model catalog key ${url}`);\n  const res = await fetch(url, {\n    method: 'GET',\n    headers: {\n      Authorization: `Bearer ${tok}`,\n      'Content-Type': 'application/json',\n    },\n  });\n\n  if (!res.ok) {\n    throw new Error(res.statusText);\n  }\n\n  const modelCatalog: ModelCatalog = await res.json();\n  return modelCatalog;\n}\n"],"names":[],"mappings":";;AA6BA,eAAsB,qBAAA,CACpB,SACA,KAAA,EACmB;AACnB,EAAA,MAAM,GAAA,GAAM,MAAM,KAAA,CAAM,CAAA,EAAG,OAAO,CAAA,KAAA,CAAA,EAAS;AAAA,IACzC,MAAA,EAAQ,KAAA;AAAA,IACR,OAAA,EAAS;AAAA,MACP,aAAA,EAAe,CAAA,OAAA,EAAU,KAAA,CAAM,KAAK,CAAA,CAAA;AAAA,MACpC,cAAA,EAAgB;AAAA;AAClB,GACD,CAAA;AAED,EAAA,IAAI,CAAC,IAAI,EAAA,EAAI;AACX,IAAA,MAAM,IAAI,KAAA,CAAM,GAAA,CAAI,UAAU,CAAA;AAAA,EAChC;AAEA,EAAA,MAAM,gBAAA,GAAqC,MAAM,GAAA,CAAI,IAAA,EAAK;AAC1D,EAAA,OAAO,gBAAA,CAAiB,IAAA;AAC1B;AAMA,eAAsB,wBAAA,CACpB,OAAA,EACA,eAAA,EACA,KAAA,EACuB;AACvB,EAAA,IAAI,GAAA,GAAM,EAAA;AACV,EAAA,IAAI,KAAA,EAAO;AACT,IAAA,GAAA,GAAM,KAAA,EAAO,KAAA;AAAA,EACf;AACA,EAAA,MAAM,GAAA,GAAM,CAAA,EAAG,OAAO,CAAA,QAAA,EAAW,eAAe,CAAA,CAAA;AAChD,EAAA,OAAA,CAAQ,GAAA,CAAI,CAAA,2BAAA,EAA8B,GAAG,CAAA,CAAE,CAAA;AAC/C,EAAA,MAAM,GAAA,GAAM,MAAM,KAAA,CAAM,GAAA,EAAK;AAAA,IAC3B,MAAA,EAAQ,KAAA;AAAA,IACR,OAAA,EAAS;AAAA,MACP,aAAA,EAAe,UAAU,GAAG,CAAA,CAAA;AAAA,MAC5B,cAAA,EAAgB;AAAA;AAClB,GACD,CAAA;AAED,EAAA,IAAI,CAAC,IAAI,EAAA,EAAI;AACX,IAAA,MAAM,IAAI,KAAA,CAAM,GAAA,CAAI,UAAU,CAAA;AAAA,EAChC;AAEA,EAAA,MAAM,YAAA,GAA6B,MAAM,GAAA,CAAI,IAAA,EAAK;AAClD,EAAA,OAAO,YAAA;AACT;;;;;"}

package/dist/clients/ModelCatalogGenerator.cjs.js

@@ -2,11 +2,16 @@
 
 var catalogModel = require('@backstage/catalog-model');
 
-function GenerateCatalogEntities(modelCatalog, logger) {
+function GenerateCatalogEntities(modelCatalog, svcUrl, logger) {
   let modelCatalogEntities = [];
   const models = modelCatalog.models;
   modelCatalogEntities = modelCatalogEntities.concat(
-    GenerateModelResourceEntities(models, modelCatalog.modelServer)
+    GenerateModelResourceEntities(
+      models,
+      modelCatalog.modelServer,
+      logger,
+      svcUrl
+    )
   );
   if (modelCatalog.modelServer !== void 0) {
     const modelServer = modelCatalog.modelServer;
@@ -24,7 +29,7 @@ function GenerateCatalogEntities(modelCatalog, logger) {
   }
   return modelCatalogEntities;
 }
-function GenerateModelResourceEntities(models, modelServer, logger) {
+function GenerateModelResourceEntities(models, modelServer, logger, svcUrl) {
   const modelResourceEntities = [];
   models.forEach((model) => {
     const modelResourceEntity = {
@@ -77,6 +82,9 @@ function GenerateModelResourceEntities(models, modelServer, logger) {
           let techdocsUrl = model.annotations[key];
           techdocsUrl = techdocsUrl.trim();
           if (techdocsUrl !== "") {
+            if (svcUrl !== void 0) {
+              techdocsUrl = svcUrl + techdocsUrl;
+            }
             modelResourceEntity.metadata.annotations["backstage.io/techdocs-ref"] = `url:${techdocsUrl}`;
           }
         } else {

package/dist/clients/ModelCatalogGenerator.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModelCatalogGenerator.cjs.js","sources":["../../src/clients/ModelCatalogGenerator.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport {\n  ModelCatalog,\n  Model,\n  ModelServer,\n  API,\n} from '@redhat-ai-dev/model-catalog-types';\nimport {\n  Entity,\n  ComponentEntity,\n  ApiEntity,\n  ResourceEntity,\n  makeValidator,\n} from '@backstage/catalog-model';\nimport { LoggerService } from '@backstage/backend-plugin-api';\n\nfunction isModelCatalog(o: any): o is ModelCatalog {\n  return 'models' in o || 'modelServer' in o;\n}\n\nexport function ParseCatalogJSON(jsonStr: string): ModelCatalog {\n  const modelCatalog: ModelCatalog = JSON.parse(jsonStr);\n  if (isModelCatalog(modelCatalog)) {\n    // do something with now correctly typed object\n    return modelCatalog;\n  }\n  throw new Error(`model catalog JSON in unexpected format: ${jsonStr}`);\n}\n\n// Generate the Backstage catalog entities that correspond to the given model catalog json object\n// Note: These entities will need to have their location and origin location annotations set before ingestion into the catalog\n// An optional logger parameter can be passed if you wish log output from the generator\nexport function GenerateCatalogEntities(\n  modelCatalog: ModelCatalog,\n  logger?: LoggerService,\n): Entity[] {\n  // Generate the Resource entities for the Model(s)\n  let modelCatalogEntities: Entity[] = [];\n  const models: Model[] = modelCatalog.models;\n  modelCatalogEntities = modelCatalogEntities.concat(\n    GenerateModelResourceEntities(models, modelCatalog.modelServer, logger),\n  );\n\n  // Generate the Model Server and Model Server APi entity, if present\n  if (modelCatalog.modelServer !== undefined) {\n    const modelServer = modelCatalog.modelServer;\n    modelCatalogEntities.push(\n      GenerateModelServerComponentEntity(\n        modelServer,\n        modelCatalog.models,\n        logger,\n      ),\n    );\n\n    // If there's an exposed API present, generate that entity as well, and update the model server entity accordingly\n    if (modelServer.API !== undefined) {\n      const api: API = modelServer.API;\n      modelCatalogEntities.push(\n        GenerateModelServerAPI(api, modelServer, logger),\n      );\n    }\n  }\n\n  return modelCatalogEntities;\n}\n\nexport function GenerateModelResourceEntities(\n  models: Model[],\n  modelServer?: ModelServer,\n  logger?: LoggerService,\n): ResourceEntity[] {\n  const modelResourceEntities: ResourceEntity[] = [];\n  models.forEach(model => {\n    const modelResourceEntity: ResourceEntity = {\n      apiVersion: 'backstage.io/v1beta1',\n      kind: 'Resource',\n      metadata: {\n        name: sanitizeMetadataName(model.name),\n        description: `${model.description}`,\n        tags: [],\n        links: [],\n      },\n      spec: {\n        owner: `user:${model.owner}`,\n        type: 'ai-model',\n      },\n    };\n\n    // Set optional parameters, if present\n    if (model.tags !== undefined) {\n      modelResourceEntity.metadata.tags = sanitizeTags(model.tags, logger);\n    }\n    if (model.artifactLocationURL !== undefined) {\n      modelResourceEntity.metadata.links?.push({\n        title: 'Artifact Location',\n        url: `${model.artifactLocationURL}`,\n      });\n    }\n    if (model.howToUseURL !== undefined) {\n      modelResourceEntity.metadata.links?.push({\n        title: 'How to use',\n        url: `${model.howToUseURL}`,\n      });\n    }\n    if (model.license !== undefined) {\n      modelResourceEntity.metadata.links?.push({\n        title: `License`,\n        url: `${model.license}`,\n      });\n    }\n    modelResourceEntity.spec.dependencyOf = [];\n    if (modelServer !== undefined) {\n      modelResourceEntity.spec.dependencyOf?.push(\n        `component:${modelServer.name}`,\n      );\n    }\n\n    // Handle any annotations present on the model resource\n    if (model.annotations !== undefined) {\n      // Initialize annotations object if needed\n      if (modelResourceEntity.metadata.annotations === undefined) {\n        modelResourceEntity.metadata.annotations = {};\n      }\n\n      // Copy all annotations from model to resource entity\n      Object.keys(model.annotations).forEach(key => {\n        // Special handling for TechDocs annotation\n        if (key === 'TechDocs') {\n          let techdocsUrl: string = model.annotations![key];\n          techdocsUrl = techdocsUrl.trim();\n          if (techdocsUrl !== '') {\n            modelResourceEntity.metadata.annotations![\n              'backstage.io/techdocs-ref'\n            ] = `url:${techdocsUrl}`;\n          }\n        } else {\n          // Copy all other annotations as-is\n          modelResourceEntity.metadata.annotations![key] =\n            model.annotations![key];\n        }\n      });\n    }\n    modelResourceEntities.push(modelResourceEntity);\n  });\n\n  return modelResourceEntities;\n}\n\nexport function GenerateModelServerComponentEntity(\n  modelServer: ModelServer,\n  models: Model[],\n  logger?: LoggerService,\n): ComponentEntity {\n  const modelServerComponent: ComponentEntity = {\n    apiVersion: 'backstage.io/v1beta1',\n    kind: 'Component',\n    metadata: {\n      name: sanitizeMetadataName(modelServer.name),\n      description: `${modelServer.description}`,\n      tags: [],\n      links: [],\n    },\n    spec: {\n      type: 'model-server',\n      lifecycle: `${modelServer.lifecycle}`,\n      owner: `user:${modelServer.owner}`,\n    },\n  };\n\n  // Add the models to the model server as dependants\n  modelServerComponent.spec.dependsOn = [];\n  models.forEach(model => {\n    modelServerComponent.spec.dependsOn?.push(`resource:${model.name}`);\n  });\n\n  // Configure optional parameters\n  // Set optional parameters, if present\n  if (modelServer.tags !== undefined) {\n    modelServerComponent.metadata.tags = sanitizeTags(modelServer.tags, logger);\n  }\n  // Add authentication tag\n  if (modelServer.authentication === undefined || !modelServer.authentication) {\n    modelServerComponent.metadata.tags?.push('auth-not-required');\n  } else {\n    modelServerComponent.metadata.tags?.push('auth-required');\n  }\n  modelServerComponent.metadata.links = [];\n  if (modelServer.API !== undefined) {\n    modelServerComponent.metadata.links.push({\n      title: `API`,\n      url: `${modelServer.API.url}`,\n    });\n    modelServerComponent.spec.providesApis = [modelServer.name];\n\n    // Copy annotations from API to component metadata if they exist\n    if (modelServer.API.annotations !== undefined) {\n      if (modelServerComponent.metadata.annotations === undefined) {\n        modelServerComponent.metadata.annotations = {};\n      }\n      // Copy all key-value pairs from API annotations to component annotations\n      Object.keys(modelServer.API.annotations).forEach(key => {\n        modelServerComponent.metadata.annotations![key] =\n          modelServer.API!.annotations![key];\n      });\n    }\n  }\n  if (modelServer.homepageURL !== undefined) {\n    modelServerComponent.metadata.links.push({\n      title: 'Homepage',\n      url: `${modelServer.homepageURL}`,\n    });\n  }\n\n  // Copy annotations from modelServer to component metadata if they exist\n  if (modelServer.annotations !== undefined) {\n    if (modelServerComponent.metadata.annotations === undefined) {\n      modelServerComponent.metadata.annotations = {};\n    }\n    // Copy all key-value pairs from modelServer annotations to component annotations\n    Object.keys(modelServer.annotations).forEach(key => {\n      modelServerComponent.metadata.annotations![key] =\n        modelServer.annotations![key];\n    });\n  }\n\n  return modelServerComponent;\n}\n\nexport function GenerateModelServerAPI(\n  api: API,\n  modelServer: ModelServer,\n  logger?: LoggerService,\n): ApiEntity {\n  const modelServerAPIEntity: ApiEntity = {\n    apiVersion: `backstage.io/v1beta1`,\n    kind: `API`,\n    metadata: {\n      name: sanitizeMetadataName(modelServer.name),\n      tags: [],\n      links: [\n        {\n          url: `${api.url}`,\n          title: `API`,\n        },\n      ],\n    },\n    spec: {\n      type: `${api.type}`,\n      owner: `user:${modelServer.owner}`,\n      lifecycle: `${modelServer.lifecycle}`,\n      definition: `${api.spec}`,\n    },\n  };\n\n  if (api.tags !== undefined) {\n    modelServerAPIEntity.metadata.tags = sanitizeTags(api.tags, logger);\n  }\n  // Add authentication tag\n  if (modelServer.authentication === undefined || !modelServer.authentication) {\n    modelServerAPIEntity.metadata.tags?.push('auth-not-required');\n  } else {\n    modelServerAPIEntity.metadata.tags?.push('auth-required');\n  }\n  return modelServerAPIEntity;\n}\n\nfunction sanitizeMetadataName(modelName: string): string {\n  return modelName.replace(/\\s/g, '');\n}\n\nfunction sanitizeTags(tags: string[], logger?: LoggerService): string[] {\n  const sanitizedTags: string[] = [];\n  tags.forEach(tag => {\n    let sanitizedTag: string = tag;\n    // Replace whitespace with empty character\n    sanitizedTag = sanitizedTag.replace(/\\s/g, '');\n\n    // Call the Backstage tag validator and check if the tag conforms\n    // If the tag is not valid, skip it\n    if (!makeValidator().isValidTag(sanitizedTag)) {\n      if (logger !== undefined) {\n        logger.error(\n          `invalid tag: ${sanitizedTag}. Tags are expected to be less than 63 characters and conform to: ^[a-z0-9:+#]+(\\-[a-z0-9:+#]+)*$`,\n        );\n      }\n      return; /* in typescript a return in a foreach skips to the next iteration */\n    }\n    sanitizedTags.push(sanitizedTag);\n  });\n  return sanitizedTags;\n}\n"],"names":["makeValidator"],"mappings":"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"}
+{"version":3,"file":"ModelCatalogGenerator.cjs.js","sources":["../../src/clients/ModelCatalogGenerator.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport {\n  ModelCatalog,\n  Model,\n  ModelServer,\n  API,\n} from '@redhat-ai-dev/model-catalog-types';\nimport {\n  Entity,\n  ComponentEntity,\n  ApiEntity,\n  ResourceEntity,\n  makeValidator,\n} from '@backstage/catalog-model';\nimport { LoggerService } from '@backstage/backend-plugin-api';\n\nfunction isModelCatalog(o: any): o is ModelCatalog {\n  return 'models' in o || 'modelServer' in o;\n}\n\nexport function ParseCatalogJSON(jsonStr: string): ModelCatalog {\n  const modelCatalog: ModelCatalog = JSON.parse(jsonStr);\n  if (isModelCatalog(modelCatalog)) {\n    // do something with now correctly typed object\n    return modelCatalog;\n  }\n  throw new Error(`model catalog JSON in unexpected format: ${jsonStr}`);\n}\n\n// Generate the Backstage catalog entities that correspond to the given model catalog json object\n// Note: These entities will need to have their location and origin location annotations set before ingestion into the catalog\n// An optional logger parameter can be passed if you wish log output from the generator\nexport function GenerateCatalogEntities(\n  modelCatalog: ModelCatalog,\n  svcUrl?: string,\n  logger?: LoggerService,\n): Entity[] {\n  // Generate the Resource entities for the Model(s)\n  let modelCatalogEntities: Entity[] = [];\n  const models: Model[] = modelCatalog.models;\n  modelCatalogEntities = modelCatalogEntities.concat(\n    GenerateModelResourceEntities(\n      models,\n      modelCatalog.modelServer,\n      logger,\n      svcUrl,\n    ),\n  );\n\n  // Generate the Model Server and Model Server APi entity, if present\n  if (modelCatalog.modelServer !== undefined) {\n    const modelServer = modelCatalog.modelServer;\n    modelCatalogEntities.push(\n      GenerateModelServerComponentEntity(\n        modelServer,\n        modelCatalog.models,\n        logger,\n      ),\n    );\n\n    // If there's an exposed API present, generate that entity as well, and update the model server entity accordingly\n    if (modelServer.API !== undefined) {\n      const api: API = modelServer.API;\n      modelCatalogEntities.push(\n        GenerateModelServerAPI(api, modelServer, logger),\n      );\n    }\n  }\n\n  return modelCatalogEntities;\n}\n\nexport function GenerateModelResourceEntities(\n  models: Model[],\n  modelServer?: ModelServer,\n  logger?: LoggerService,\n  svcUrl?: string,\n): ResourceEntity[] {\n  const modelResourceEntities: ResourceEntity[] = [];\n  models.forEach(model => {\n    const modelResourceEntity: ResourceEntity = {\n      apiVersion: 'backstage.io/v1beta1',\n      kind: 'Resource',\n      metadata: {\n        name: sanitizeMetadataName(model.name),\n        description: `${model.description}`,\n        tags: [],\n        links: [],\n      },\n      spec: {\n        owner: `user:${model.owner}`,\n        type: 'ai-model',\n      },\n    };\n\n    // Set optional parameters, if present\n    if (model.tags !== undefined) {\n      modelResourceEntity.metadata.tags = sanitizeTags(model.tags, logger);\n    }\n    if (model.artifactLocationURL !== undefined) {\n      modelResourceEntity.metadata.links?.push({\n        title: 'Artifact Location',\n        url: `${model.artifactLocationURL}`,\n      });\n    }\n    if (model.howToUseURL !== undefined) {\n      modelResourceEntity.metadata.links?.push({\n        title: 'How to use',\n        url: `${model.howToUseURL}`,\n      });\n    }\n    if (model.license !== undefined) {\n      modelResourceEntity.metadata.links?.push({\n        title: `License`,\n        url: `${model.license}`,\n      });\n    }\n    modelResourceEntity.spec.dependencyOf = [];\n    if (modelServer !== undefined) {\n      modelResourceEntity.spec.dependencyOf?.push(\n        `component:${modelServer.name}`,\n      );\n    }\n\n    // Handle any annotations present on the model resource\n    if (model.annotations !== undefined) {\n      // Initialize annotations object if needed\n      if (modelResourceEntity.metadata.annotations === undefined) {\n        modelResourceEntity.metadata.annotations = {};\n      }\n\n      // Copy all annotations from model to resource entity\n      Object.keys(model.annotations).forEach(key => {\n        // Special handling for TechDocs annotation\n        if (key === 'TechDocs') {\n          let techdocsUrl: string = model.annotations![key];\n          techdocsUrl = techdocsUrl.trim();\n          // TODO GGM prepend svc URL\n          if (techdocsUrl !== '') {\n            if (svcUrl !== undefined) {\n              techdocsUrl = svcUrl + techdocsUrl;\n            }\n            modelResourceEntity.metadata.annotations![\n              'backstage.io/techdocs-ref'\n            ] = `url:${techdocsUrl}`;\n          }\n        } else {\n          // Copy all other annotations as-is\n          modelResourceEntity.metadata.annotations![key] =\n            model.annotations![key];\n        }\n      });\n    }\n    modelResourceEntities.push(modelResourceEntity);\n  });\n\n  return modelResourceEntities;\n}\n\nexport function GenerateModelServerComponentEntity(\n  modelServer: ModelServer,\n  models: Model[],\n  logger?: LoggerService,\n): ComponentEntity {\n  const modelServerComponent: ComponentEntity = {\n    apiVersion: 'backstage.io/v1beta1',\n    kind: 'Component',\n    metadata: {\n      name: sanitizeMetadataName(modelServer.name),\n      description: `${modelServer.description}`,\n      tags: [],\n      links: [],\n    },\n    spec: {\n      type: 'model-server',\n      lifecycle: `${modelServer.lifecycle}`,\n      owner: `user:${modelServer.owner}`,\n    },\n  };\n\n  // Add the models to the model server as dependants\n  modelServerComponent.spec.dependsOn = [];\n  models.forEach(model => {\n    modelServerComponent.spec.dependsOn?.push(`resource:${model.name}`);\n  });\n\n  // Configure optional parameters\n  // Set optional parameters, if present\n  if (modelServer.tags !== undefined) {\n    modelServerComponent.metadata.tags = sanitizeTags(modelServer.tags, logger);\n  }\n  // Add authentication tag\n  if (modelServer.authentication === undefined || !modelServer.authentication) {\n    modelServerComponent.metadata.tags?.push('auth-not-required');\n  } else {\n    modelServerComponent.metadata.tags?.push('auth-required');\n  }\n  modelServerComponent.metadata.links = [];\n  if (modelServer.API !== undefined) {\n    modelServerComponent.metadata.links.push({\n      title: `API`,\n      url: `${modelServer.API.url}`,\n    });\n    modelServerComponent.spec.providesApis = [modelServer.name];\n\n    // Copy annotations from API to component metadata if they exist\n    if (modelServer.API.annotations !== undefined) {\n      if (modelServerComponent.metadata.annotations === undefined) {\n        modelServerComponent.metadata.annotations = {};\n      }\n      // Copy all key-value pairs from API annotations to component annotations\n      Object.keys(modelServer.API.annotations).forEach(key => {\n        modelServerComponent.metadata.annotations![key] =\n          modelServer.API!.annotations![key];\n      });\n    }\n  }\n  if (modelServer.homepageURL !== undefined) {\n    modelServerComponent.metadata.links.push({\n      title: 'Homepage',\n      url: `${modelServer.homepageURL}`,\n    });\n  }\n\n  // Copy annotations from modelServer to component metadata if they exist\n  if (modelServer.annotations !== undefined) {\n    if (modelServerComponent.metadata.annotations === undefined) {\n      modelServerComponent.metadata.annotations = {};\n    }\n    // Copy all key-value pairs from modelServer annotations to component annotations\n    Object.keys(modelServer.annotations).forEach(key => {\n      modelServerComponent.metadata.annotations![key] =\n        modelServer.annotations![key];\n    });\n  }\n\n  return modelServerComponent;\n}\n\nexport function GenerateModelServerAPI(\n  api: API,\n  modelServer: ModelServer,\n  logger?: LoggerService,\n): ApiEntity {\n  const modelServerAPIEntity: ApiEntity = {\n    apiVersion: `backstage.io/v1beta1`,\n    kind: `API`,\n    metadata: {\n      name: sanitizeMetadataName(modelServer.name),\n      tags: [],\n      links: [\n        {\n          url: `${api.url}`,\n          title: `API`,\n        },\n      ],\n    },\n    spec: {\n      type: `${api.type}`,\n      owner: `user:${modelServer.owner}`,\n      lifecycle: `${modelServer.lifecycle}`,\n      definition: `${api.spec}`,\n    },\n  };\n\n  if (api.tags !== undefined) {\n    modelServerAPIEntity.metadata.tags = sanitizeTags(api.tags, logger);\n  }\n  // Add authentication tag\n  if (modelServer.authentication === undefined || !modelServer.authentication) {\n    modelServerAPIEntity.metadata.tags?.push('auth-not-required');\n  } else {\n    modelServerAPIEntity.metadata.tags?.push('auth-required');\n  }\n  return modelServerAPIEntity;\n}\n\nfunction sanitizeMetadataName(modelName: string): string {\n  return modelName.replace(/\\s/g, '');\n}\n\nfunction sanitizeTags(tags: string[], logger?: LoggerService): string[] {\n  const sanitizedTags: string[] = [];\n  tags.forEach(tag => {\n    let sanitizedTag: string = tag;\n    // Replace whitespace with empty character\n    sanitizedTag = sanitizedTag.replace(/\\s/g, '');\n\n    // Call the Backstage tag validator and check if the tag conforms\n    // If the tag is not valid, skip it\n    if (!makeValidator().isValidTag(sanitizedTag)) {\n      if (logger !== undefined) {\n        logger.error(\n          `invalid tag: ${sanitizedTag}. Tags are expected to be less than 63 characters and conform to: ^[a-z0-9:+#]+(\\-[a-z0-9:+#]+)*$`,\n        );\n      }\n      return; /* in typescript a return in a foreach skips to the next iteration */\n    }\n    sanitizedTags.push(sanitizedTag);\n  });\n  return sanitizedTags;\n}\n"],"names":["makeValidator"],"mappings":"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"}

package/dist/index.d.ts

@@ -19,12 +19,16 @@ interface ModelCatalogKeys {
  * fetchModelCatalogKeys retrieves the keys for each of the model catalog entries in the model catalog bridge service
  * @public
  */
-declare function fetchModelCatalogKeys(baseUrl: string): Promise<string[]>;
+declare function fetchModelCatalogKeys(baseUrl: string, token: {
+    token: string;
+}): Promise<string[]>;
 /**
  * fetchModelCatalogFromKey fetches a model catalog JSON object from the bridge based on a given key
  * @public
  */
-declare function fetchModelCatalogFromKey(baseUrl: string, modelCatalogKey: string): Promise<ModelCatalog>;
+declare function fetchModelCatalogFromKey(baseUrl: string, modelCatalogKey: string, token?: {
+    token: string;
+}): Promise<ModelCatalog>;
 
 export { catalogModuleModelCatalogResourceEntityProvider as default, fetchModelCatalogFromKey, fetchModelCatalogKeys };
 export type { ModelCatalogKeys };

package/dist/module.cjs.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var backendPluginApi = require('@backstage/backend-plugin-api');
-var alpha = require('@backstage/plugin-catalog-node/alpha');
+var pluginCatalogNode = require('@backstage/plugin-catalog-node');
 var ModelCatalogResourceEntityProvider = require('./providers/ModelCatalogResourceEntityProvider.cjs.js');
 
 const catalogModuleModelCatalogResourceEntityProvider = backendPluginApi.createBackendModule({
@@ -10,15 +10,17 @@ const catalogModuleModelCatalogResourceEntityProvider = backendPluginApi.createB
   register(env) {
     env.registerInit({
       deps: {
-        catalog: alpha.catalogProcessingExtensionPoint,
+        catalog: pluginCatalogNode.catalogProcessingExtensionPoint,
         config: backendPluginApi.coreServices.rootConfig,
+        discovery: backendPluginApi.coreServices.discovery,
+        auth: backendPluginApi.coreServices.auth,
         logger: backendPluginApi.coreServices.logger,
         scheduler: backendPluginApi.coreServices.scheduler
       },
-      async init({ catalog, config, logger, scheduler }) {
-        catalog.addEntityProvider(
-          ModelCatalogResourceEntityProvider.ModelCatalogResourceEntityProvider.fromConfig(
-            { config, logger },
+      async init({ catalog, config, discovery, auth, logger, scheduler }) {
+        try {
+          const ep = ModelCatalogResourceEntityProvider.ModelCatalogResourceEntityProvider.fromConfig(
+            { config, logger, discovery, auth },
             {
               schedule: scheduler.createScheduledTaskRunner({
                 frequency: { seconds: 30 },
@@ -26,8 +28,12 @@ const catalogModuleModelCatalogResourceEntityProvider = backendPluginApi.createB
               }),
               scheduler
             }
-          )
-        );
+          );
+          catalog.addEntityProvider(ep);
+        } catch (error) {
+          console.error(error);
+          throw error;
+        }
       }
     });
   }

package/dist/module.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.cjs.js","sources":["../src/module.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport {\n  coreServices,\n  createBackendModule,\n} from '@backstage/backend-plugin-api';\nimport { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';\n\nimport { ModelCatalogResourceEntityProvider } from './providers';\n\n/**\n * catalogModuleModelCatalogResourceEntityProvider defines the model catalog entity provider which runs on startup\n *\n * @public\n */\nexport const catalogModuleModelCatalogResourceEntityProvider =\n  createBackendModule({\n    moduleId: 'catalog-backend-module-model-catalog',\n    pluginId: 'catalog',\n    register(env) {\n      env.registerInit({\n        deps: {\n          catalog: catalogProcessingExtensionPoint,\n          config: coreServices.rootConfig,\n          logger: coreServices.logger,\n          scheduler: coreServices.scheduler,\n        },\n        async init({ catalog, config, logger, scheduler }) {\n          catalog.addEntityProvider(\n            ModelCatalogResourceEntityProvider.fromConfig(\n              { config, logger },\n              {\n                schedule: scheduler.createScheduledTaskRunner({\n                  frequency: { seconds: 30 },\n                  timeout: { minutes: 3 },\n                }),\n                scheduler: scheduler,\n              },\n            ),\n          );\n        },\n      });\n    },\n  });\n"],"names":["createBackendModule","catalogProcessingExtensionPoint","coreServices","ModelCatalogResourceEntityProvider"],"mappings":";;;;;;AA4BO,MAAM,kDACXA,oCAAoB,CAAA;AAAA,EAClB,QAAU,EAAA,sCAAA;AAAA,EACV,QAAU,EAAA,SAAA;AAAA,EACV,SAAS,GAAK,EAAA;AACZ,IAAA,GAAA,CAAI,YAAa,CAAA;AAAA,MACf,IAAM,EAAA;AAAA,QACJ,OAAS,EAAAC,qCAAA;AAAA,QACT,QAAQC,6BAAa,CAAA,UAAA;AAAA,QACrB,QAAQA,6BAAa,CAAA,MAAA;AAAA,QACrB,WAAWA,6BAAa,CAAA;AAAA,OAC1B;AAAA,MACA,MAAM,IAAK,CAAA,EAAE,SAAS,MAAQ,EAAA,MAAA,EAAQ,WAAa,EAAA;AACjD,QAAQ,OAAA,CAAA,iBAAA;AAAA,UACNC,qEAAmC,CAAA,UAAA;AAAA,YACjC,EAAE,QAAQ,MAAO,EAAA;AAAA,YACjB;AAAA,cACE,QAAA,EAAU,UAAU,yBAA0B,CAAA;AAAA,gBAC5C,SAAA,EAAW,EAAE,OAAA,EAAS,EAAG,EAAA;AAAA,gBACzB,OAAA,EAAS,EAAE,OAAA,EAAS,CAAE;AAAA,eACvB,CAAA;AAAA,cACD;AAAA;AACF;AACF,SACF;AAAA;AACF,KACD,CAAA;AAAA;AAEL,CAAC;;;;"}
+{"version":3,"file":"module.cjs.js","sources":["../src/module.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport {\n  coreServices,\n  createBackendModule,\n} from '@backstage/backend-plugin-api';\nimport { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';\n\nimport { ModelCatalogResourceEntityProvider } from './providers';\n\n/**\n * catalogModuleModelCatalogResourceEntityProvider defines the model catalog entity provider which runs on startup\n *\n * @public\n */\nexport const catalogModuleModelCatalogResourceEntityProvider =\n  createBackendModule({\n    moduleId: 'catalog-backend-module-model-catalog',\n    pluginId: 'catalog',\n    register(env) {\n      env.registerInit({\n        deps: {\n          catalog: catalogProcessingExtensionPoint,\n          config: coreServices.rootConfig,\n          discovery: coreServices.discovery,\n          auth: coreServices.auth,\n          logger: coreServices.logger,\n          scheduler: coreServices.scheduler,\n        },\n        async init({ catalog, config, discovery, auth, logger, scheduler }) {\n          try {\n            const ep = ModelCatalogResourceEntityProvider.fromConfig(\n              { config, logger, discovery, auth },\n              {\n                schedule: scheduler.createScheduledTaskRunner({\n                  frequency: { seconds: 30 },\n                  timeout: { minutes: 3 },\n                }),\n                scheduler: scheduler,\n              },\n            );\n            catalog.addEntityProvider(ep);\n          } catch (error) {\n            console.error(error);\n            throw error;\n          }\n        },\n      });\n    },\n  });\n"],"names":["createBackendModule","catalogProcessingExtensionPoint","coreServices","ModelCatalogResourceEntityProvider"],"mappings":";;;;;;AA4BO,MAAM,kDACXA,oCAAA,CAAoB;AAAA,EAClB,QAAA,EAAU,sCAAA;AAAA,EACV,QAAA,EAAU,SAAA;AAAA,EACV,SAAS,GAAA,EAAK;AACZ,IAAA,GAAA,CAAI,YAAA,CAAa;AAAA,MACf,IAAA,EAAM;AAAA,QACJ,OAAA,EAASC,iDAAA;AAAA,QACT,QAAQC,6BAAA,CAAa,UAAA;AAAA,QACrB,WAAWA,6BAAA,CAAa,SAAA;AAAA,QACxB,MAAMA,6BAAA,CAAa,IAAA;AAAA,QACnB,QAAQA,6BAAA,CAAa,MAAA;AAAA,QACrB,WAAWA,6BAAA,CAAa;AAAA,OAC1B;AAAA,MACA,MAAM,KAAK,EAAE,OAAA,EAAS,QAAQ,SAAA,EAAW,IAAA,EAAM,MAAA,EAAQ,SAAA,EAAU,EAAG;AAClE,QAAA,IAAI;AACF,UAAA,MAAM,KAAKC,qEAAA,CAAmC,UAAA;AAAA,YAC5C,EAAE,MAAA,EAAQ,MAAA,EAAQ,SAAA,EAAW,IAAA,EAAK;AAAA,YAClC;AAAA,cACE,QAAA,EAAU,UAAU,yBAAA,CAA0B;AAAA,gBAC5C,SAAA,EAAW,EAAE,OAAA,EAAS,EAAA,EAAG;AAAA,gBACzB,OAAA,EAAS,EAAE,OAAA,EAAS,CAAA;AAAE,eACvB,CAAA;AAAA,cACD;AAAA;AACF,WACF;AACA,UAAA,OAAA,CAAQ,kBAAkB,EAAE,CAAA;AAAA,QAC9B,SAAS,KAAA,EAAO;AACd,UAAA,OAAA,CAAQ,MAAM,KAAK,CAAA;AACnB,UAAA,MAAM,KAAA;AAAA,QACR;AAAA,MACF;AAAA,KACD,CAAA;AAAA,EACH;AACF,CAAC;;;;"}

package/dist/providers/ModelCatalogResourceEntityProvider.cjs.js

@@ -7,9 +7,11 @@ var errors = require('@backstage/errors');
 var ModelCatalogGenerator = require('../clients/ModelCatalogGenerator.cjs.js');
 
 class ModelCatalogResourceEntityProvider {
-  env;
+  name;
   baseUrl;
   logger;
+  discovery;
+  auth;
   scheduleFn;
   connection;
   /**
@@ -17,7 +19,7 @@ class ModelCatalogResourceEntityProvider {
    * @public
    */
   static fromConfig(deps, options) {
-    const { config: config$1, logger } = deps;
+    const { config: config$1, logger, discovery, auth } = deps;
     const providerConfigs = config.readModelCatalogApiEntityConfigs(config$1);
     return providerConfigs.map((providerConfig) => {
       let taskRunner;
@@ -35,14 +37,18 @@ class ModelCatalogResourceEntityProvider {
       return new ModelCatalogResourceEntityProvider(
         providerConfig,
         logger,
+        discovery,
+        auth,
         taskRunner
       );
     });
   }
   /** [1]: Set configuration values passed into the entity provider. Fields are defined in types.ts */
-  constructor(config, logger, taskRunner) {
-    this.env = config.id;
+  constructor(config, logger, discovery, auth, taskRunner) {
+    this.name = config.id;
     this.baseUrl = config.baseUrl;
+    this.discovery = discovery;
+    this.auth = auth;
     this.logger = logger.child({
       target: this.getProviderName()
     });
@@ -60,7 +66,7 @@ class ModelCatalogResourceEntityProvider {
           } catch (error) {
             if (errors.isError(error)) {
               this.logger.error(
-                `Error while syncing resources from Model Catalog ${this.baseUrl}`,
+                `Error while syncing resources from Model Catalog ${this.name}`,
                 {
                   // Default Error properties:
                   name: error.name,
@@ -78,7 +84,7 @@ class ModelCatalogResourceEntityProvider {
   }
   /** [2]: Model Catalog entity provider must have a unique name */
   getProviderName() {
-    return `ModelCatalogResourceEntityProvider:${this.env}`;
+    return `ModelCatalogResourceEntityProvider:${this.name}`;
   }
   /** [3]: Connect Backstage catalog engine to ModelCatalogEntityProvider */
   async connect(connection) {
@@ -91,22 +97,33 @@ class ModelCatalogResourceEntityProvider {
       throw new Error("Not initialized");
     }
     this.logger.info(
-      `Discovering ResourceEntities from Model Server ${this.baseUrl}`
+      `Discovering ResourceEntities from Model Server ${this.name}`
     );
-    let catalogKeys = await BridgeResourceConnector.fetchModelCatalogKeys(this.baseUrl);
+    const svcUrl = await this.discovery.getBaseUrl(this.name);
+    let url = this.baseUrl;
+    if (svcUrl.length > 0 && url.length === 0) {
+      url = svcUrl;
+    }
+    const backendToken = await this.auth.getPluginRequestToken({
+      onBehalfOf: await this.auth.getOwnServiceCredentials(),
+      targetPluginId: this.name
+    });
+    let catalogKeys = await BridgeResourceConnector.fetchModelCatalogKeys(url, backendToken);
     if (catalogKeys === null || catalogKeys === void 0) {
       catalogKeys = [];
     }
-    let entityList = [];
     this.logger.debug(`Found ${catalogKeys.length} model catalogs`);
     this.logger.debug(`Fetched ModelCatalog: ${JSON.stringify(catalogKeys)}`);
-    await Promise.all(
+    const entityList = (await Promise.all(
       catalogKeys.map(async (key) => {
-        const catalog = await BridgeResourceConnector.fetchModelCatalogFromKey(this.baseUrl, key);
-        const catalogEntities = ModelCatalogGenerator.GenerateCatalogEntities(catalog);
-        entityList = entityList.concat(catalogEntities);
+        const catalog = await BridgeResourceConnector.fetchModelCatalogFromKey(
+          url,
+          key,
+          backendToken
+        );
+        return ModelCatalogGenerator.GenerateCatalogEntities(catalog, url);
       })
-    );
+    )).flat();
     entityList.forEach((entity) => {
       if (entity.metadata.annotations === void 0) {
         entity.metadata.annotations = {

package/dist/providers/ModelCatalogResourceEntityProvider.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModelCatalogResourceEntityProvider.cjs.js","sources":["../../src/providers/ModelCatalogResourceEntityProvider.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport type {\n  LoggerService,\n  SchedulerService,\n  SchedulerServiceTaskRunner,\n} from '@backstage/backend-plugin-api';\nimport {\n  EntityProvider,\n  EntityProviderConnection,\n} from '@backstage/plugin-catalog-node';\nimport {\n  ANNOTATION_LOCATION,\n  ANNOTATION_ORIGIN_LOCATION,\n  Entity,\n} from '@backstage/catalog-model';\n\nimport {\n  fetchModelCatalogFromKey,\n  fetchModelCatalogKeys,\n} from '../clients/BridgeResourceConnector';\nimport { ModelCatalogConfig } from './types';\nimport { readModelCatalogApiEntityConfigs } from './config';\nimport type { Config } from '@backstage/config';\nimport { InputError, isError } from '@backstage/errors';\nimport { GenerateCatalogEntities } from '../clients/ModelCatalogGenerator';\n/**\n * Provides entities from the model catalog service, allowing models and model servers to be imported into RHDH\n *\n * @public\n */\nexport class ModelCatalogResourceEntityProvider implements EntityProvider {\n  private readonly env: string;\n  private readonly baseUrl: string;\n  private readonly logger: LoggerService;\n  private readonly scheduleFn: () => Promise<void>;\n  private connection?: EntityProviderConnection;\n\n  /**\n   * Fetches the configuration values specified for the entity provider in the app-config.yaml\n   * @public\n   */\n  static fromConfig(\n    deps: {\n      config: Config;\n      logger: LoggerService;\n    },\n    options:\n      | { schedule: SchedulerServiceTaskRunner }\n      | { scheduler: SchedulerService },\n  ): ModelCatalogResourceEntityProvider[] {\n    const { config, logger } = deps;\n\n    const providerConfigs = readModelCatalogApiEntityConfigs(config);\n\n    return providerConfigs.map(providerConfig => {\n      let taskRunner;\n      if ('scheduler' in options && providerConfig.schedule) {\n        taskRunner = options.scheduler.createScheduledTaskRunner(\n          providerConfig.schedule,\n        );\n      } else if ('schedule' in options) {\n        taskRunner = options.schedule;\n      } else {\n        throw new InputError(\n          `No schedule provided via config for ModelCatalogResourceEntityProvider:${providerConfig.id}.`,\n        );\n      }\n\n      return new ModelCatalogResourceEntityProvider(\n        providerConfig,\n        logger,\n        taskRunner,\n      );\n    });\n  }\n  /** [1]: Set configuration values passed into the entity provider. Fields are defined in types.ts */\n  private constructor(\n    config: ModelCatalogConfig,\n    logger: LoggerService,\n    taskRunner: SchedulerServiceTaskRunner,\n  ) {\n    this.env = config.id;\n    this.baseUrl = config.baseUrl;\n    this.logger = logger.child({\n      target: this.getProviderName(),\n    });\n    this.scheduleFn = this.createScheduleFn(taskRunner);\n  }\n\n  /** Configure the schedule function and its logger */\n  createScheduleFn(\n    taskRunner: SchedulerServiceTaskRunner,\n  ): () => Promise<void> {\n    return async () => {\n      const taskId = `${this.getProviderName()}:run`;\n      return taskRunner.run({\n        id: taskId,\n        fn: async () => {\n          try {\n            await this.run();\n          } catch (error) {\n            if (isError(error)) {\n              // Ensure that we don't log any sensitive internal data:\n              this.logger.error(\n                `Error while syncing resources from Model Catalog ${this.baseUrl}`,\n                {\n                  // Default Error properties:\n                  name: error.name,\n                  message: error.message,\n                  stack: error.stack,\n                  // Additional status code if available:\n                  status: (error.response as { status?: string })?.status,\n                },\n              );\n            }\n          }\n        },\n      });\n    };\n  }\n\n  /** [2]: Model Catalog entity provider must have a unique name */\n  getProviderName(): string {\n    return `ModelCatalogResourceEntityProvider:${this.env}`;\n  }\n\n  /** [3]: Connect Backstage catalog engine to ModelCatalogEntityProvider */\n  async connect(connection: EntityProviderConnection): Promise<void> {\n    this.connection = connection;\n    await this.scheduleFn();\n  }\n\n  /** [4]: Define the function that the entity provider will execute on a set schedule */\n  async run(): Promise<void> {\n    if (!this.connection) {\n      throw new Error('Not initialized');\n    }\n    this.logger.info(\n      `Discovering ResourceEntities from Model Server ${this.baseUrl}`,\n    );\n\n    /** [5]: Fetch the model catalog keys from the bridge and fetch the corresponding catalog entries. */\n    let catalogKeys = await fetchModelCatalogKeys(this.baseUrl);\n    // If no models are registered yet, the catalogKeys array may be null, so handle it by setting it to be an emptyList\n    if (catalogKeys === null || catalogKeys === undefined) {\n      catalogKeys = [];\n    }\n    let entityList: Entity[] = [];\n    this.logger.debug(`Found ${catalogKeys.length} model catalogs`);\n    this.logger.debug(`Fetched ModelCatalog: ${JSON.stringify(catalogKeys)}`);\n\n    await Promise.all(\n      catalogKeys.map(async key => {\n        const catalog = await fetchModelCatalogFromKey(this.baseUrl, key);\n        const catalogEntities = GenerateCatalogEntities(catalog);\n        entityList = entityList.concat(catalogEntities);\n      }),\n    );\n\n    entityList.forEach(entity => {\n      if (entity.metadata.annotations === undefined) {\n        entity.metadata.annotations = {\n          [ANNOTATION_LOCATION]: this.getProviderName(),\n          [ANNOTATION_ORIGIN_LOCATION]: this.getProviderName(),\n        };\n      } else {\n        entity.metadata.annotations[ANNOTATION_LOCATION] =\n          this.getProviderName();\n        entity.metadata.annotations[ANNOTATION_ORIGIN_LOCATION] =\n          this.getProviderName();\n      }\n    });\n    this.logger.debug(`Found ${entityList.length} entities`);\n    this.logger.debug(`Fetched Entities: ${JSON.stringify(entityList)}`);\n    /** [6]: Add/update the catalog entities that correspond to the models */\n    await this.connection.applyMutation({\n      type: 'full',\n      entities: entityList.map(entity => ({\n        entity,\n        locationKey: this.getProviderName(),\n      })),\n    });\n  }\n\n  /* private getEntityLocationRef(entity: LocationEntityV1alpha1): string {\n    const ref = entity.metadata.annotations?.[ANNOTATION_LOCATION];\n    if (!ref) {\n      throw new InputError(\n        `Entity '${entity.metadata.name}' does not have the annotation ${ANNOTATION_LOCATION}`,\n      );\n    }\n    return ref;\n  }\n\n  private getLocationEntity(\n    urlStr: string,\n  ): { entity: LocationEntityV1alpha1; locationKey: string }[] {\n    const entity = locationSpecToLocationEntity({\n      location: {\n        type: 'rhdh-rhoai-bridge',\n        target: urlStr,\n      },\n    });\n    const locationKey = this.getEntityLocationRef(entity);\n    return [{ entity, locationKey }];\n  }*/\n\n  /* private convertModelNameToEntityName(modelName: string): string {\n    return modelName.replaceAll(/\\:/g, '-');\n  }\n\n  private convertModeServerName(modelName: string): string {\n    return modelName.replaceAll(/\\s/g, '-').toLowerCase();\n  }\n\n  private buildResourceEntityFromModelEndpoint(\n    models: ModelList,\n    modelServerName: string,\n  ): ResourceEntity[] {\n    const modelResources: ResourceEntity[] = [];\n    models.data.forEach(model => {\n      const modelResourceEntity: ResourceEntity = {\n        kind: 'Resource',\n        apiVersion: 'backstage.io/v1alpha1',\n        metadata: {\n          annotations: {\n            [ANNOTATION_LOCATION]: this.getProviderName(),\n            [ANNOTATION_ORIGIN_LOCATION]: this.getProviderName(),\n          },\n          name: `${this.convertModelNameToEntityName(model.id)}`,\n          description: `STUB description`,\n          links: [\n            {\n              url: `${this.baseUrl}`,\n              title: 'Model API',\n            },\n          ],\n        },\n        spec: {\n          type: `ai-model`,\n          owner: `${this.owner}`,\n          dependencyOf: [`component:${modelServerName}`],\n          ...(this.system && { system: `${this.system}` }),\n        },\n      };\n      modelResources.push(modelResourceEntity);\n    });\n    return modelResources;\n  }\n\n  private buildComponentEntityFromModelEndpoint(\n    modelServerName: string,\n  ): ComponentEntity {\n    const modelServerComponent: ComponentEntity = {\n      kind: 'Component',\n      apiVersion: 'backstage.io/v1alpha1',\n      metadata: {\n        annotations: {\n          [ANNOTATION_LOCATION]: this.getProviderName(),\n          [ANNOTATION_ORIGIN_LOCATION]: this.getProviderName(),\n        },\n        name: `${this.convertModeServerName(modelServerName)}`,\n        description: `${this.name}`,\n        links: [\n          {\n            url: `${this.baseUrl}`,\n            title: 'Model Server API',\n          },\n        ],\n      },\n      spec: {\n        type: `model-server`,\n        lifecycle: 'production',\n        owner: `${this.owner}`,\n        ...(this.system && { system: `${this.system}` }),\n      },\n    };\n\n    return modelServerComponent;\n  }*/\n}\n"],"names":["config","readModelCatalogApiEntityConfigs","InputError","isError","fetchModelCatalogKeys","fetchModelCatalogFromKey","GenerateCatalogEntities","ANNOTATION_LOCATION","ANNOTATION_ORIGIN_LOCATION"],"mappings":"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"}
+{"version":3,"file":"ModelCatalogResourceEntityProvider.cjs.js","sources":["../../src/providers/ModelCatalogResourceEntityProvider.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport type {\n  AuthService,\n  DiscoveryService,\n  LoggerService,\n  SchedulerService,\n  SchedulerServiceTaskRunner,\n} from '@backstage/backend-plugin-api';\nimport {\n  EntityProvider,\n  EntityProviderConnection,\n} from '@backstage/plugin-catalog-node';\nimport {\n  ANNOTATION_LOCATION,\n  ANNOTATION_ORIGIN_LOCATION,\n} from '@backstage/catalog-model';\n\nimport {\n  fetchModelCatalogFromKey,\n  fetchModelCatalogKeys,\n} from '../clients/BridgeResourceConnector';\nimport { ModelCatalogConfig } from './types';\nimport { readModelCatalogApiEntityConfigs } from './config';\nimport type { Config } from '@backstage/config';\nimport { InputError, isError } from '@backstage/errors';\nimport { GenerateCatalogEntities } from '../clients/ModelCatalogGenerator';\n/**\n * Provides entities from the model catalog service, allowing models and model servers to be imported into RHDH\n *\n * @public\n */\nexport class ModelCatalogResourceEntityProvider implements EntityProvider {\n  private readonly name: string;\n  private readonly baseUrl: string;\n  private readonly logger: LoggerService;\n  private readonly discovery: DiscoveryService;\n  private readonly auth: AuthService;\n  private readonly scheduleFn: () => Promise<void>;\n  private connection?: EntityProviderConnection;\n\n  /**\n   * Fetches the configuration values specified for the entity provider in the app-config.yaml\n   * @public\n   */\n  static fromConfig(\n    deps: {\n      config: Config;\n      logger: LoggerService;\n      discovery: DiscoveryService;\n      auth: AuthService;\n    },\n    options:\n      | { schedule: SchedulerServiceTaskRunner }\n      | { scheduler: SchedulerService },\n  ): ModelCatalogResourceEntityProvider[] {\n    const { config, logger, discovery, auth } = deps;\n\n    const providerConfigs = readModelCatalogApiEntityConfigs(config);\n\n    return providerConfigs.map(providerConfig => {\n      let taskRunner;\n      if ('scheduler' in options && providerConfig.schedule) {\n        taskRunner = options.scheduler.createScheduledTaskRunner(\n          providerConfig.schedule,\n        );\n      } else if ('schedule' in options) {\n        taskRunner = options.schedule;\n      } else {\n        throw new InputError(\n          `No schedule provided via config for ModelCatalogResourceEntityProvider:${providerConfig.id}.`,\n        );\n      }\n\n      return new ModelCatalogResourceEntityProvider(\n        providerConfig,\n        logger,\n        discovery,\n        auth,\n        taskRunner,\n      );\n    });\n  }\n  /** [1]: Set configuration values passed into the entity provider. Fields are defined in types.ts */\n  private constructor(\n    config: ModelCatalogConfig,\n    logger: LoggerService,\n    discovery: DiscoveryService,\n    auth: AuthService,\n    taskRunner: SchedulerServiceTaskRunner,\n  ) {\n    this.name = config.id;\n    this.baseUrl = config.baseUrl;\n    this.discovery = discovery;\n    this.auth = auth;\n    this.logger = logger.child({\n      target: this.getProviderName(),\n    });\n    this.scheduleFn = this.createScheduleFn(taskRunner);\n  }\n\n  /** Configure the schedule function and its logger */\n  createScheduleFn(\n    taskRunner: SchedulerServiceTaskRunner,\n  ): () => Promise<void> {\n    return async () => {\n      const taskId = `${this.getProviderName()}:run`;\n      return taskRunner.run({\n        id: taskId,\n        fn: async () => {\n          try {\n            await this.run();\n          } catch (error) {\n            if (isError(error)) {\n              // Ensure that we don't log any sensitive internal data:\n              this.logger.error(\n                `Error while syncing resources from Model Catalog ${this.name}`,\n                {\n                  // Default Error properties:\n                  name: error.name,\n                  message: error.message,\n                  stack: error.stack,\n                  // Additional status code if available:\n                  status: (error.response as { status?: string })?.status,\n                },\n              );\n            }\n          }\n        },\n      });\n    };\n  }\n\n  /** [2]: Model Catalog entity provider must have a unique name */\n  getProviderName(): string {\n    return `ModelCatalogResourceEntityProvider:${this.name}`;\n  }\n\n  /** [3]: Connect Backstage catalog engine to ModelCatalogEntityProvider */\n  async connect(connection: EntityProviderConnection): Promise<void> {\n    this.connection = connection;\n    await this.scheduleFn();\n  }\n\n  /** [4]: Define the function that the entity provider will execute on a set schedule */\n  async run(): Promise<void> {\n    if (!this.connection) {\n      throw new Error('Not initialized');\n    }\n    this.logger.info(\n      `Discovering ResourceEntities from Model Server ${this.name}`,\n    );\n\n    /** [5]: Fetch the model catalog keys from the bridge and fetch the corresponding catalog entries. */\n    // the api docs for this method says to run it each time vs. once during init, as the URL can change\n    const svcUrl = await this.discovery.getBaseUrl(this.name);\n    let url = this.baseUrl;\n    if (svcUrl.length > 0 && url.length === 0) {\n      url = svcUrl;\n    }\n    const backendToken = await this.auth.getPluginRequestToken({\n      onBehalfOf: await this.auth.getOwnServiceCredentials(),\n      targetPluginId: this.name,\n    });\n    let catalogKeys = await fetchModelCatalogKeys(url, backendToken);\n    // If no models are registered yet, the catalogKeys array may be null, so handle it by setting it to be an emptyList\n    if (catalogKeys === null || catalogKeys === undefined) {\n      catalogKeys = [];\n    }\n    this.logger.debug(`Found ${catalogKeys.length} model catalogs`);\n    this.logger.debug(`Fetched ModelCatalog: ${JSON.stringify(catalogKeys)}`);\n\n    const entityList = (\n      await Promise.all(\n        catalogKeys.map(async key => {\n          const catalog = await fetchModelCatalogFromKey(\n            url,\n            key,\n            backendToken,\n          );\n          return GenerateCatalogEntities(catalog, url);\n        }),\n      )\n    ).flat();\n\n    entityList.forEach(entity => {\n      if (entity.metadata.annotations === undefined) {\n        entity.metadata.annotations = {\n          [ANNOTATION_LOCATION]: this.getProviderName(),\n          [ANNOTATION_ORIGIN_LOCATION]: this.getProviderName(),\n        };\n      } else {\n        entity.metadata.annotations[ANNOTATION_LOCATION] =\n          this.getProviderName();\n        entity.metadata.annotations[ANNOTATION_ORIGIN_LOCATION] =\n          this.getProviderName();\n      }\n    });\n    this.logger.debug(`Found ${entityList.length} entities`);\n    this.logger.debug(`Fetched Entities: ${JSON.stringify(entityList)}`);\n    /** [6]: Add/update the catalog entities that correspond to the models */\n    await this.connection.applyMutation({\n      type: 'full',\n      entities: entityList.map(entity => ({\n        entity,\n        locationKey: this.getProviderName(),\n      })),\n    });\n  }\n\n  /* private getEntityLocationRef(entity: LocationEntityV1alpha1): string {\n    const ref = entity.metadata.annotations?.[ANNOTATION_LOCATION];\n    if (!ref) {\n      throw new InputError(\n        `Entity '${entity.metadata.name}' does not have the annotation ${ANNOTATION_LOCATION}`,\n      );\n    }\n    return ref;\n  }\n\n  private getLocationEntity(\n    urlStr: string,\n  ): { entity: LocationEntityV1alpha1; locationKey: string }[] {\n    const entity = locationSpecToLocationEntity({\n      location: {\n        type: 'rhdh-rhoai-bridge',\n        target: urlStr,\n      },\n    });\n    const locationKey = this.getEntityLocationRef(entity);\n    return [{ entity, locationKey }];\n  }*/\n\n  /* private convertModelNameToEntityName(modelName: string): string {\n    return modelName.replaceAll(/\\:/g, '-');\n  }\n\n  private convertModeServerName(modelName: string): string {\n    return modelName.replaceAll(/\\s/g, '-').toLowerCase();\n  }\n\n  private buildResourceEntityFromModelEndpoint(\n    models: ModelList,\n    modelServerName: string,\n  ): ResourceEntity[] {\n    const modelResources: ResourceEntity[] = [];\n    models.data.forEach(model => {\n      const modelResourceEntity: ResourceEntity = {\n        kind: 'Resource',\n        apiVersion: 'backstage.io/v1alpha1',\n        metadata: {\n          annotations: {\n            [ANNOTATION_LOCATION]: this.getProviderName(),\n            [ANNOTATION_ORIGIN_LOCATION]: this.getProviderName(),\n          },\n          name: `${this.convertModelNameToEntityName(model.id)}`,\n          description: `STUB description`,\n          links: [\n            {\n              url: `${this.baseUrl}`,\n              title: 'Model API',\n            },\n          ],\n        },\n        spec: {\n          type: `ai-model`,\n          owner: `${this.owner}`,\n          dependencyOf: [`component:${modelServerName}`],\n          ...(this.system && { system: `${this.system}` }),\n        },\n      };\n      modelResources.push(modelResourceEntity);\n    });\n    return modelResources;\n  }\n\n  private buildComponentEntityFromModelEndpoint(\n    modelServerName: string,\n  ): ComponentEntity {\n    const modelServerComponent: ComponentEntity = {\n      kind: 'Component',\n      apiVersion: 'backstage.io/v1alpha1',\n      metadata: {\n        annotations: {\n          [ANNOTATION_LOCATION]: this.getProviderName(),\n          [ANNOTATION_ORIGIN_LOCATION]: this.getProviderName(),\n        },\n        name: `${this.convertModeServerName(modelServerName)}`,\n        description: `${this.name}`,\n        links: [\n          {\n            url: `${this.baseUrl}`,\n            title: 'Model Server API',\n          },\n        ],\n      },\n      spec: {\n        type: `model-server`,\n        lifecycle: 'production',\n        owner: `${this.owner}`,\n        ...(this.system && { system: `${this.system}` }),\n      },\n    };\n\n    return modelServerComponent;\n  }*/\n}\n"],"names":["config","readModelCatalogApiEntityConfigs","InputError","isError","fetchModelCatalogKeys","fetchModelCatalogFromKey","GenerateCatalogEntities","ANNOTATION_LOCATION","ANNOTATION_ORIGIN_LOCATION"],"mappings":"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"}

package/dist/providers/config.cjs.js

@@ -14,7 +14,10 @@ function readModelCatalogApiEntityConfigs(config) {
   );
 }
 function readModelCatalogApiEntityConfig(id, config) {
-  const baseUrl = config.getString("baseUrl");
+  let baseUrl = "";
+  if (config.has("baseUrl")) {
+    baseUrl = config.getString("baseUrl");
+  }
   const schedule = config.has("schedule") ? backendPluginApi.readSchedulerServiceTaskScheduleDefinitionFromConfig(
     config.getConfig("schedule")
   ) : void 0;

package/dist/providers/config.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.cjs.js","sources":["../../src/providers/config.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { readSchedulerServiceTaskScheduleDefinitionFromConfig } from '@backstage/backend-plugin-api';\nimport type { Config } from '@backstage/config';\n\nimport type { ModelCatalogConfig } from './types';\n\n/**\n * readModelCatalogApiEntityConfigs reads the configuration for the ModelCatalog provider\n *\n * @public\n */\nexport function readModelCatalogApiEntityConfigs(\n  config: Config,\n): ModelCatalogConfig[] {\n  const providerConfigs = config.getOptionalConfig(\n    'catalog.providers.modelCatalog',\n  );\n  if (!providerConfigs) {\n    return [];\n  }\n  return providerConfigs\n    .keys()\n    .map(id =>\n      readModelCatalogApiEntityConfig(id, providerConfigs.getConfig(id)),\n    );\n}\n\nfunction readModelCatalogApiEntityConfig(\n  id: string,\n  config: Config,\n): ModelCatalogConfig {\n  const baseUrl = config.getString('baseUrl');\n\n  const schedule = config.has('schedule')\n    ? readSchedulerServiceTaskScheduleDefinitionFromConfig(\n        config.getConfig('schedule'),\n      )\n    : undefined;\n\n  return {\n    id,\n    baseUrl,\n    schedule,\n  };\n}\n"],"names":["readSchedulerServiceTaskScheduleDefinitionFromConfig"],"mappings":";;;;AAyBO,SAAS,iCACd,MACsB,EAAA;AACtB,EAAA,MAAM,kBAAkB,MAAO,CAAA,iBAAA;AAAA,IAC7B;AAAA,GACF;AACA,EAAA,IAAI,CAAC,eAAiB,EAAA;AACpB,IAAA,OAAO,EAAC;AAAA;AAEV,EAAO,OAAA,eAAA,CACJ,MACA,CAAA,GAAA;AAAA,IAAI,QACH,+BAAgC,CAAA,EAAA,EAAI,eAAgB,CAAA,SAAA,CAAU,EAAE,CAAC;AAAA,GACnE;AACJ;AAEA,SAAS,+BAAA,CACP,IACA,MACoB,EAAA;AACpB,EAAM,MAAA,OAAA,GAAU,MAAO,CAAA,SAAA,CAAU,SAAS,CAAA;AAE1C,EAAA,MAAM,QAAW,GAAA,MAAA,CAAO,GAAI,CAAA,UAAU,CAClC,GAAAA,qEAAA;AAAA,IACE,MAAA,CAAO,UAAU,UAAU;AAAA,GAE7B,GAAA,MAAA;AAEJ,EAAO,OAAA;AAAA,IACL,EAAA;AAAA,IACA,OAAA;AAAA,IACA;AAAA,GACF;AACF;;;;"}
+{"version":3,"file":"config.cjs.js","sources":["../../src/providers/config.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { readSchedulerServiceTaskScheduleDefinitionFromConfig } from '@backstage/backend-plugin-api';\nimport type { Config } from '@backstage/config';\n\nimport type { ModelCatalogConfig } from './types';\n\n/**\n * readModelCatalogApiEntityConfigs reads the configuration for the ModelCatalog provider\n *\n * @public\n */\nexport function readModelCatalogApiEntityConfigs(\n  config: Config,\n): ModelCatalogConfig[] {\n  const providerConfigs = config.getOptionalConfig(\n    'catalog.providers.modelCatalog',\n  );\n  if (!providerConfigs) {\n    return [];\n  }\n  return providerConfigs\n    .keys()\n    .map(id =>\n      readModelCatalogApiEntityConfig(id, providerConfigs.getConfig(id)),\n    );\n}\n\nfunction readModelCatalogApiEntityConfig(\n  id: string,\n  config: Config,\n): ModelCatalogConfig {\n  let baseUrl = '';\n  if (config.has('baseUrl')) {\n    baseUrl = config.getString('baseUrl');\n  }\n\n  const schedule = config.has('schedule')\n    ? readSchedulerServiceTaskScheduleDefinitionFromConfig(\n        config.getConfig('schedule'),\n      )\n    : undefined;\n\n  return {\n    id,\n    baseUrl,\n    schedule,\n  };\n}\n"],"names":["readSchedulerServiceTaskScheduleDefinitionFromConfig"],"mappings":";;;;AAyBO,SAAS,iCACd,MAAA,EACsB;AACtB,EAAA,MAAM,kBAAkB,MAAA,CAAO,iBAAA;AAAA,IAC7B;AAAA,GACF;AACA,EAAA,IAAI,CAAC,eAAA,EAAiB;AACpB,IAAA,OAAO,EAAC;AAAA,EACV;AACA,EAAA,OAAO,eAAA,CACJ,MAAK,CACL,GAAA;AAAA,IAAI,QACH,+BAAA,CAAgC,EAAA,EAAI,eAAA,CAAgB,SAAA,CAAU,EAAE,CAAC;AAAA,GACnE;AACJ;AAEA,SAAS,+BAAA,CACP,IACA,MAAA,EACoB;AACpB,EAAA,IAAI,OAAA,GAAU,EAAA;AACd,EAAA,IAAI,MAAA,CAAO,GAAA,CAAI,SAAS,CAAA,EAAG;AACzB,IAAA,OAAA,GAAU,MAAA,CAAO,UAAU,SAAS,CAAA;AAAA,EACtC;AAEA,EAAA,MAAM,QAAA,GAAW,MAAA,CAAO,GAAA,CAAI,UAAU,CAAA,GAClCA,qEAAA;AAAA,IACE,MAAA,CAAO,UAAU,UAAU;AAAA,GAC7B,GACA,MAAA;AAEJ,EAAA,OAAO;AAAA,IACL,EAAA;AAAA,IACA,OAAA;AAAA,IACA;AAAA,GACF;AACF;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@red-hat-developer-hub/backstage-plugin-catalog-backend-module-model-catalog",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "license": "Apache-2.0",
   "description": "The model-catalog backend module for the catalog plugin.",
   "main": "dist/index.cjs.js",
@@ -36,21 +36,21 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/backend-plugin-api": "^1.5.0",
-    "@backstage/catalog-client": "^1.12.1",
-    "@backstage/catalog-model": "^1.7.6",
-    "@backstage/errors": "^1.2.7",
-    "@backstage/plugin-catalog-backend": "^3.2.0",
-    "@backstage/plugin-catalog-common": "^1.1.7",
-    "@backstage/plugin-catalog-node": "^1.20.0",
+    "@backstage/backend-plugin-api": "^1.9.2",
+    "@backstage/catalog-client": "^1.16.0",
+    "@backstage/catalog-model": "^1.9.0",
+    "@backstage/errors": "^1.3.1",
+    "@backstage/plugin-catalog-backend": "^3.8.0",
+    "@backstage/plugin-catalog-common": "^1.1.10",
+    "@backstage/plugin-catalog-node": "^2.2.2",
     "@redhat-ai-dev/model-catalog-types": "^1.1.0",
     "js-yaml": "^4.1.0",
     "stream": "^0.0.3",
     "yaml": "^2.7.0"
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "^1.10.1",
-    "@backstage/cli": "^0.34.5"
+    "@backstage/backend-test-utils": "^1.11.4",
+    "@backstage/cli": "^0.36.3"
   },
   "files": [
     "dist"