gitlab-cloud-connector 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17fe80dc098578ea54c50cf02e06e83bb516a4b18d6fbb649d9fd7d593e853c8
-  data.tar.gz: 89cbb45796d3eaa078a36e084b872f7b820f6fbf85fb745490cb164c52a66447
+  metadata.gz: '08c7db0c9954f05f5d443707897e0b65510833196d84fe0232b8ea683dbe54e4'
+  data.tar.gz: 2fab7c9d5729454622896fe48211341e993e27a1e924921de2358c9b38cccb8c
 SHA512:
-  metadata.gz: 52f2b3ac0efb7d0aff0a360bf2272cdaf3151a8b912ce3d60503ac0cb2297f72809e879254751afeec188d7976c80b94f5f1fcd318792559f3460a7f32de8331
-  data.tar.gz: a4f104be9c1c99486d2b44a5183aba2c71d2f398cb4454557e27684e2669ac7c95394c6abe4321fb3f2e928ed59617a917886431fdf87c1e136255270bef8fa5
+  metadata.gz: bb6be93bbb1f0bd7e3808832618fc2f1532b06ab3cbab62cf9a05eac234f3ff0b2b0ac4dddeb2d5b57e5c7337d8d80d36167817bf418c0d0fbb3cb29c88b531f
+  data.tar.gz: e32d689a3358fd29e8fd7431f9a815b9fd9adb8056e102d1f8efd4918cd907f00a8e3ca0f84cbc89691c0903f27cbc9d1c272b4c96a9d68511ca560a37fe418c

data/README.md

@@ -10,8 +10,6 @@ We expect Bundler is used to manage dependencies. To add the dependency, add it
 gem "gitlab-cloud-connector", "~> 1.0.0", require: 'gitlab/cloud_connector'
 ```
 
-## Usage
-
 ### Data Storage
 
 Cloud Connector uses YAML files stored in the project's `/config` directory. The data is organized by model type:

data/config/services/anthropic_proxy.yml

@@ -10,3 +10,4 @@ unit_primitives:
   - summarize_issue_discussions
   - summarize_new_merge_request
   - summarize_review
+  - description_composer

data/config/services/duo_chat.yml

@@ -10,7 +10,6 @@ unit_primitives:
   - documentation_search
   - duo_chat
   - explain_code
-  - explain_terminal
   - fix_code
   - include_dependency_context
   - include_file_context
@@ -18,5 +17,6 @@ unit_primitives:
   - include_local_git_context
   - include_merge_request_context
   - include_snippet_context
+  - include_terminal_context
   - refactor_code
-  - write_tests
+  - write_tests

data/config/services/self_hosted_models.yml

@@ -20,5 +20,6 @@ unit_primitives:
   - include_local_git_context
   - include_merge_request_context
   - include_snippet_context
+  - include_terminal_context
   - refactor_code
   - write_tests

data/config/services/vertex_ai_proxy.yml

@@ -6,4 +6,3 @@ unit_primitives:
   - glab_ask_git_command
   - semantic_search_issue
   - summarize_issue_discussions
-  - summarize_merge_request

data/config/unit_primitives/description_composer.yml

@@ -0,0 +1,11 @@
+---
+name: description_composer
+description: Composes a description for a merge request.
+cut_off_date: 2024-10-17T00:00:00+00:00
+group: group::code review
+feature_category: code_review_workflow
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/183512
+backend_services:
+  - ai_gateway
+add_ons:
+  - duo_enterprise

data/config/unit_primitives/{explain_terminal.yml → include_terminal_context.yml}

@@ -1,6 +1,6 @@
 ---
-name: explain_terminal
-description: Explain terminal or command line interface output.
+name: include_terminal_context
+description: Include terminal context in the prompt.
 cut_off_date: 2024-10-17T00:00:00+00:00
 group: group::duo_chat
 feature_category: duo_chat

data/lib/gitlab/cloud_connector/available_services_generator.rb

@@ -28,7 +28,6 @@ module Gitlab
         security_scans
         semantic_search_issue
         summarize_issue_discussions
-        summarize_merge_request
         write_tests
       ].freeze
 

data/lib/gitlab/cloud_connector/configuration.rb

@@ -1,21 +1,48 @@
 # frozen_string_literal: true
 
+require_relative 'data_model/yaml_data_loader'
+require_relative 'data_model/abstract_data_loader'
+
 module Gitlab
   module CloudConnector
     module Configuration
+      DEFAULT_DATA_LOADER_CLASS = Gitlab::CloudConnector::DataModel::YamlDataLoader
+      INVALID_LOADER_MESSAGE = "Data loader must inherit from Gitlab::CloudConnector::DataModel::AbstractDataLoader"
+
+      InvalidDataLoaderError = Class.new(StandardError)
+
       class << self
-        attr_writer :config_dir
+        attr_writer :config_dir, :memoize_data
 
         def config_dir
           @config_dir ||= File.expand_path("../../../config", __dir__).freeze
         end
 
+        def data_loader_class
+          @data_loader_class ||= DEFAULT_DATA_LOADER_CLASS
+        end
+
+        def data_loader_class=(klass)
+          validate_data_loader!(klass)
+          @data_loader_class = klass
+        end
+
+        def memoize_data?
+          return @memoize_data unless @memoize_data.nil?
+
+          (data_loader_class == DEFAULT_DATA_LOADER_CLASS)
+        end
+
         def configure
           yield self if block_given?
         end
 
-        def reset!
-          @config_dir = nil
+        private
+
+        def validate_data_loader!(klass)
+          return if klass && klass < Gitlab::CloudConnector::DataModel::AbstractDataLoader
+
+          raise InvalidDataLoaderError, INVALID_LOADER_MESSAGE
         end
       end
     end

data/lib/gitlab/cloud_connector/data_model/abstract_data_loader.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module CloudConnector
+    module DataModel
+      class AbstractDataLoader
+        def initialize(model_class)
+          @model_class = model_class
+        end
+
+        def load!
+          raise NotImplementedError, "#{self.class} must implement #load!"
+        end
+
+        protected
+
+        attr_reader :model_class
+      end
+    end
+  end
+end

data/lib/gitlab/cloud_connector/data_model/base.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative 'associations'
-require_relative 'data_loader'
 
 module Gitlab
   module CloudConnector
@@ -24,13 +23,17 @@ module Gitlab
           end
 
           def all
-            @all ||= data_loader.load!
+            if Configuration.memoize_data?
+              @all ||= data_loader.load!
+            else
+              data_loader.load!
+            end
           end
 
           private
 
           def data_loader
-            @data_loader ||= DataLoader.new(self)
+            Configuration.data_loader_class.new(self)
           end
         end
 
@@ -43,6 +46,13 @@ module Gitlab
         def [](name)
           instance_variable_get(:"@#{name}")
         end
+
+        def to_hash
+          instance_variables.each_with_object({}) do |var, hash|
+            key = var.to_s.delete('@').to_sym
+            hash[key] = instance_variable_get(var)
+          end
+        end
       end
     end
   end

data/lib/gitlab/cloud_connector/data_model/yaml_data_loader.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'yaml'
+require_relative 'abstract_data_loader'
+
+module Gitlab
+  module CloudConnector
+    module DataModel
+      class YamlDataLoader < AbstractDataLoader
+        def load!
+          Dir.glob(data_files_path).map { |file| load_model_from_file(file) }
+        end
+
+        private
+
+        def data_files_path
+          File.join(CloudConnector::Configuration.config_dir, model_class.model_name.tableize, '*.yml')
+        end
+
+        def load_model_from_file(file_path)
+          data = YAML.safe_load(
+            File.read(file_path),
+            permitted_classes: [Time],
+            symbolize_names: true
+          ).deep_symbolize_keys!
+
+          model_class.new(**data)
+        rescue StandardError => e
+          raise "Error loading file #{file_path}: #{e.message}"
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/cloud_connector/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module CloudConnector
-    VERSION = '1.0.0'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-cloud-connector
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Nikola Milojevic
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-20 00:00:00.000000000 Z
+date: 2025-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -128,11 +128,11 @@ files:
 - config/unit_primitives/categorize_duo_chat_question.yml
 - config/unit_primitives/code_suggestions.yml
 - config/unit_primitives/complete_code.yml
+- config/unit_primitives/description_composer.yml
 - config/unit_primitives/documentation_search.yml
 - config/unit_primitives/duo_chat.yml
 - config/unit_primitives/duo_workflow_execute_workflow.yml
 - config/unit_primitives/explain_code.yml
-- config/unit_primitives/explain_terminal.yml
 - config/unit_primitives/explain_vulnerability.yml
 - config/unit_primitives/fix_code.yml
 - config/unit_primitives/generate_code.yml
@@ -146,6 +146,7 @@ files:
 - config/unit_primitives/include_local_git_context.yml
 - config/unit_primitives/include_merge_request_context.yml
 - config/unit_primitives/include_snippet_context.yml
+- config/unit_primitives/include_terminal_context.yml
 - config/unit_primitives/measure_comment_temperature.yml
 - config/unit_primitives/observability_all.yml
 - config/unit_primitives/refactor_code.yml
@@ -155,7 +156,6 @@ files:
 - config/unit_primitives/semantic_search_issue.yml
 - config/unit_primitives/summarize_comments.yml
 - config/unit_primitives/summarize_issue_discussions.yml
-- config/unit_primitives/summarize_merge_request.yml
 - config/unit_primitives/summarize_new_merge_request.yml
 - config/unit_primitives/summarize_review.yml
 - config/unit_primitives/troubleshoot_job.yml
@@ -163,9 +163,11 @@ files:
 - lib/gitlab/cloud_connector.rb
 - lib/gitlab/cloud_connector/available_services_generator.rb
 - lib/gitlab/cloud_connector/configuration.rb
+- lib/gitlab/cloud_connector/data_model/abstract_data_loader.rb
 - lib/gitlab/cloud_connector/data_model/associations.rb
 - lib/gitlab/cloud_connector/data_model/base.rb
 - lib/gitlab/cloud_connector/data_model/data_loader.rb
+- lib/gitlab/cloud_connector/data_model/yaml_data_loader.rb
 - lib/gitlab/cloud_connector/data_models.rb
 - lib/gitlab/cloud_connector/json_web_token.rb
 - lib/gitlab/cloud_connector/version.rb

data/config/unit_primitives/summarize_merge_request.yml

@@ -1,11 +0,0 @@
----
-name: summarize_merge_request
-description: Summarize merge request from the comments.
-cut_off_date: 2024-10-17T00:00:00+00:00
-group: group::code review
-feature_category: code_review_workflow
-documentation_url: https://docs.gitlab.com/ee/user/gitlab_duo/#merge-request-summary
-backend_services:
-  - ai_gateway
-add_ons:
-  - duo_enterprise