gitlab-cloud-connector 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d3a9c6cb24eae104dda40308b879b159d1e1583da6c39292dc864b3f9306746
-  data.tar.gz: 474c1fa8efc2fb0480818d74ac587152aa3ab907a5c340e3d5de7524c95fb3e2
+  metadata.gz: 7b483b10874986b71ec2c3b91a53dfd4fdcbd78be20144aeb63e26fe521df83b
+  data.tar.gz: 50eaf9263b69b27d22a689be8943967a998a10c9944e17d0ea1ecc25b9c1d79a
 SHA512:
-  metadata.gz: f502784866d6d67fdbccbf262591ccc14d0a96fd44c6e38ab0de5273e224ce85258e0e504ded2d90f8d00b6f7a48662afae650a3dc8afe6de39ad8adcba37b26
-  data.tar.gz: ce85d65412bf2722bc68c5dcc2c8f16fa5da8c80147abef96c606dce03367aaaf053396671cf88281530aba9cce406440ef6b4ce11ce35a0379e3966c989edd9
+  metadata.gz: d0efcf11ce2879783ceb5d3a6027c8ab7f2e35e6b97690db1e6c7e366f1116765a09ee047ee3396bb7e94718a14eab7e20e2733e267ee934e9dce3fb72df03ea
+  data.tar.gz: 3d5ae9797a346b4d92fecbf8e5c8acc8f4a2136745ec4b5e138e5cb896a38972b87144f3fddd91620cd83bc347f7b7953be59d8a4ddd48a7910359fa4b585510

data/README.md

@@ -34,16 +34,18 @@ add_ons:
   - duo_enterprise
 ```
 
-### Working with DataModels
+### Working with DataModel
 
-`DataModels` are the core data structures in the Cloud Connector. Each model inherits from `DataModel::Base`. The data is loaded from YAML files into memory at runtime, making it efficient for read operations and relationship traversal.
+`DataModel` contains the core data structures in the Ruby library.
+Each model inherits from `DataModel::Base`. The data is loaded from YAML files into memory at runtime, making it efficient
+for read operations and relationship traversal.
 
 ```ruby
 require 'gitlab/cloud_connector'
 
 # Find unit primitive by name
 # Note:  value should be a symbol (e.g., `:duo_chat` instead of `'duo_chat'`).
-duo_chat = Gitlab::CloudConnector::DataModels::UnitPrimitive.find_by_name(:duo_chat)
+duo_chat = Gitlab::CloudConnector::DataModel::UnitPrimitive.find_by_name(:duo_chat)
 duo_chat.description
 duo_chat.cut_off_date
 

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/ask_merge_request.yml

@@ -1,6 +1,6 @@
 ---
 name: ask_merge_request
-description: Ask questions about GitLab merge reuest.
+description: Ask questions about GitLab merge request.
 cut_off_date: 2024-10-17T00:00:00+00:00
 group: group::duo_chat
 feature_category: duo_chat

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
 
@@ -45,7 +44,7 @@ module Gitlab
       def generate_services_config(gitlab_realm)
         services_config = {}
 
-        DataModels::Service.each do |service|
+        DataModel::Service.each do |service|
           next if service.gitlab_realm && !service.gitlab_realm&.include?(gitlab_realm)
 
           service_config = generate_service_config(service.unit_primitives, service.basic_unit_primitive)
@@ -56,7 +55,7 @@ module Gitlab
         end
 
         # Generate a stand-alone service for each unit primitive (except the ones in the ignore list)
-        unit_primitives = DataModels::UnitPrimitive.reject { |up| IGNORE_UNIT_PRIMITIVES.include?(up.name) }
+        unit_primitives = DataModel::UnitPrimitive.reject { |up| IGNORE_UNIT_PRIMITIVES.include?(up.name) }
         unit_primitives.each do |unit_primitive|
           next if services_config[unit_primitive.name]
 

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

@@ -23,7 +23,7 @@ module Gitlab
 
         def load_association_records(association_name)
           names = Array(self[association_name])
-          association_class = Gitlab::CloudConnector::DataModels.const_get(association_name.to_s.classify)
+          association_class = Gitlab::CloudConnector::DataModel.const_get(association_name.to_s.classify)
           association_class.select { |record| names.include?(record.name.to_s) }
         end
       end

data/lib/gitlab/cloud_connector/{data_models.rb → data_model.rb}

@@ -4,8 +4,10 @@ require_relative 'data_model/base'
 
 module Gitlab
   module CloudConnector
-    module DataModels
-      class UnitPrimitive < DataModel::Base
+    module DataModel
+      autoload(:YamlDataLoader, 'gitlab/cloud_connector/data_model/yaml_data_loader')
+
+      class UnitPrimitive < Base
         has_and_belongs_to_many :backend_services
         has_and_belongs_to_many :add_ons
         has_and_belongs_to_many :license_types
@@ -15,21 +17,21 @@ module Gitlab
           :min_gitlab_version_for_free_access, :name, :unit_primitive_issue_url
       end
 
-      class Service < DataModel::Base
+      class Service < Base
         has_and_belongs_to_many :unit_primitives
 
         attr_reader :basic_unit_primitive, :description, :gitlab_realm, :name
       end
 
-      class BackendService < DataModel::Base
+      class BackendService < Base
         attr_reader :description, :group, :jwt_aud, :name, :project_url
       end
 
-      class LicenseType < DataModel::Base
+      class LicenseType < Base
         attr_reader :description, :name
       end
 
-      class AddOn < DataModel::Base
+      class AddOn < Base
         attr_reader :description, :name
       end
     end

data/lib/gitlab/cloud_connector/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module CloudConnector
-    VERSION = '1.1.0'
+    VERSION = '1.3.0'
   end
 end

data/lib/gitlab/cloud_connector.rb

@@ -7,7 +7,7 @@ module Gitlab
   module CloudConnector
     autoload(:JsonWebToken, 'gitlab/cloud_connector/json_web_token')
     autoload(:Configuration, 'gitlab/cloud_connector/configuration')
-    autoload(:DataModels, 'gitlab/cloud_connector/data_models')
+    autoload(:DataModel, 'gitlab/cloud_connector/data_model')
     autoload(:AvailableServicesGenerator, 'gitlab/cloud_connector/available_services_generator')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-cloud-connector
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Nikola Milojevic
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-05 00:00:00.000000000 Z
+date: 2025-03-13 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,12 +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.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
 homepage: https://gitlab.com/gitlab-org/cloud-connector/gitlab-cloud-connector

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

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

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'yaml'
-
-module Gitlab
-  module CloudConnector
-    module DataModel
-      class DataLoader
-        def initialize(model_class)
-          @model_class = model_class
-        end
-
-        def load!
-          Dir.glob(data_files_path).map { |file| load_model_from_file(file) }
-        end
-
-        private
-
-        attr_reader :model_class
-
-        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