Update changeset

.changeset/shiny-fans-drive.md

@@ -0,0 +1,14 @@
+---
+'@roadiehq/scaffolder-backend-module-http-request': minor
+'@roadiehq/scaffolder-backend-module-utils': minor
+'@roadiehq/scaffolder-backend-module-aws': minor
+'@roadiehq/backstage-plugin-github-pull-requests': minor
+'@roadiehq/scaffolder-backend-argocd': minor
+'backend': minor
+'@roadiehq/rag-ai-backend-retrieval-augmenter': patch
+'@roadiehq/backstage-plugin-github-insights': patch
+'@roadiehq/rag-ai-backend-embeddings-openai': patch
+'@roadiehq/rag-ai-backend-embeddings-aws': patch
+---
+
+Update scaffolder packages, tidy up some imports

packages/backend/src/plugins/ai.ts

@@ -25,8 +25,8 @@ import { Bedrock } from '@langchain/community/llms/bedrock';
 
 export default async function createPlugin({
   logger,
-  database,
   tokenManager,
+  database,
   discovery,
   config,
 }: PluginEnvironment) {
@@ -44,8 +44,8 @@ export default async function createPlugin({
   const credProvider = await awsCredentialsManager.getCredentialProvider();
   const augmentationIndexer = await initializeBedrockEmbeddings({
     logger,
-    catalogApi,
     tokenManager,
+    catalogApi,
     vectorStore,
     discovery,
     config,
@@ -64,8 +64,8 @@ export default async function createPlugin({
 
   const ragAi = await initializeRagAiBackend({
     logger,
-    augmentationIndexer,
     tokenManager,
+    augmentationIndexer,
     retrievalPipeline: createDefaultRetrievalPipeline({
       discovery,
       logger,

plugins/backend/rag-ai-backend-embeddings-openai/src/index.ts

@@ -27,18 +27,18 @@ import { AugmentationOptions } from '@roadiehq/rag-ai-backend-retrieval-augmente
 
 export interface RoadieBedrockEmbeddingsConfig {
   logger: Logger | LoggerService;
+  tokenManager: TokenManager;
   vectorStore: RoadieVectorStore;
   catalogApi: CatalogApi;
-  tokenManager: TokenManager;
   discovery: PluginEndpointDiscovery;
   config: Config;
 }
 
 export async function initializeOpenAiEmbeddings({
   logger,
+  tokenManager,
   vectorStore,
   catalogApi,
-  tokenManager,
   discovery,
   config,
 }: RoadieBedrockEmbeddingsConfig): Promise<AugmentationIndexer> {
@@ -61,7 +61,7 @@ export async function initializeOpenAiEmbeddings({
     discovery,
     augmentationOptions,
     logger: logger.child({ label: 'roadie-openai-embeddings' }),
-    config: openAiConfig,
     tokenManager,
+    config: openAiConfig,
   });
 }

plugins/backend/rag-ai-backend-retrieval-augmenter/src/indexing/DefaultVectorAugmentationIndexer.ts

@@ -55,19 +55,19 @@ export class DefaultVectorAugmentationIndexer implements AugmentationIndexer {
     catalogApi,
     logger,
     auth,
+    tokenManager,
     embeddings,
     discovery,
     augmentationOptions,
-    tokenManager,
   }: {
     vectorStore: RoadieVectorStore;
     catalogApi: CatalogApi;
     logger: LoggerService;
     auth?: AuthService;
+    tokenManager?: TokenManager;
     embeddings: Embeddings;
     discovery: DiscoveryService;
     augmentationOptions?: AugmentationOptions;
-    tokenManager?: TokenManager;
   }) {
     vectorStore.connectEmbeddings(embeddings);
     this._vectorStore = vectorStore;

plugins/backend/rag-ai-backend-retrieval-augmenter/src/indexing/types.ts

@@ -30,9 +30,9 @@ export type AugmentationOptions = {
 
 export interface RoadieEmbeddingsConfig {
   logger: LoggerService;
+  tokenManager?: TokenManager;
   vectorStore: RoadieVectorStore;
   catalogApi: CatalogApi;
-  tokenManager?: TokenManager;
   discovery: PluginEndpointDiscovery;
   augmentationOptions?: AugmentationOptions;
 }

plugins/backend/rag-ai-backend/README.md

@@ -152,6 +152,7 @@ const retrievalPipeline = createDefaultRetrievalPipeline({
   discovery,
   logger,
   vectorStore: augmentationIndexer.vectorStore,
+  tokenManager,
 });
 ```
 
@@ -193,6 +194,7 @@ import { Bedrock } from '@langchain/community/llms/bedrock';
 
 export default async function createPlugin({
   logger,
+  tokenManager,
   database,
   discovery,
   config,
@@ -211,6 +213,7 @@ export default async function createPlugin({
   const credProvider = await awsCredentialsManager.getCredentialProvider();
   const augmentationIndexer = await initializeBedrockEmbeddings({
     logger,
+    tokenManager,
     catalogApi,
     vectorStore,
     discovery,
@@ -231,11 +234,13 @@ export default async function createPlugin({
 
   const ragAi = await initializeRagAiBackend({
     logger,
+    tokenManager,
     augmentationIndexer,
     retrievalPipeline: createDefaultRetrievalPipeline({
       discovery,
       logger,
       vectorStore: augmentationIndexer.vectorStore,
+      tokenManager,
     }),
     model,
     config,
@@ -300,6 +305,7 @@ export default async function createPlugin({
       discovery,
       logger,
       vectorStore: augmentationIndexer.vectorStore,
+      tokenManager,
     }),
     model,
     config,

plugins/backend/rag-ai-backend/src/service/types.ts

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { TokenManager } from '@backstage/backend-common';
 import { AugmentationIndexer, RetrievalPipeline } from '@roadiehq/rag-ai-node';
 import { Logger } from 'winston';
 import { LoggerService } from '@backstage/backend-plugin-api';
 import { BaseLLM } from '@langchain/core/language_models/llms';
 import { BaseChatModel } from '@langchain/core/language_models/chat_models';
 import { Config } from '@backstage/config';
-import { TokenManager } from '@backstage/backend-common';
 
 export interface RagAiConfig {
   logger: Logger | LoggerService;