forest_admin_agent 1.24.10 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 945940689d1b0e9df1037a46fb887ef57689ce8777f1e4ab501feb2764e9c8c2
-  data.tar.gz: 62b510fc2325ef81be9a88ab43b964c21738b360416fc7def5f7c2f25e2456ba
+  metadata.gz: cc7482432c06c209f581b462b2c90fb3d8dbb7b2d297e7e7305c45884f737b14
+  data.tar.gz: 947c66674a785b48451e38b1220fa9c85c5f96d02250c2b2cb82155833bf9147
 SHA512:
-  metadata.gz: a358be6cd63ebaebca5b002c61d5ff96e6c7f440c719dcf90bf1a94a72c5427ed48ec758b5f1128f13425166684be906c1907806fdd23e9023be1678d1d67dc1
-  data.tar.gz: 92e025ef1682312f076022ed03b75301789d2f7466917404935fae762ea4f381058e02a85da5daa8fa011abaa318bf07329bb7c0773b811807ed33f59ee34da7
+  metadata.gz: 9987dc80f3f4425733cb8e3dde076bc6fce16a4a1422f0213c50f45f6eeb6e8008028d1ea77a33e91229997f728b337652ba06bc8d2d5d8641a395462915340a
+  data.tar.gz: c3b6fb9de748a805bbfe4a02c943ac2919b63fe9f10438b53569d710669fb9b70db81fa8affa210ec5a8a33c69db4f23eb96f6b5b041fe6c7da497366414cfcf

data/forest_admin_agent.gemspec

@@ -35,12 +35,9 @@ admin work on any Ruby application."
 
   spec.add_dependency "activesupport", ">= 6.1"
   spec.add_dependency "base64"
-  spec.add_dependency "benchmark"
   spec.add_dependency "bigdecimal"
-  spec.add_dependency "cgi"
   spec.add_dependency "csv"
   spec.add_dependency "deepsort", "~> 0.4.5"
-  spec.add_dependency "logger"
   spec.add_dependency "mutex_m"
   spec.add_dependency "ostruct"
   spec.add_dependency "dry-container", "~> 0.11"
@@ -48,7 +45,7 @@ admin work on any Ruby application."
   spec.add_dependency "filecache", "~> 1.0"
   spec.add_dependency "ipaddress", "~> 0.8.3"
   spec.add_dependency "jsonapi-serializers", "~> 1.0"
-  spec.add_dependency "jwt", "~> 3.1"
+  spec.add_dependency "jwt", "~> 2.7"
   spec.add_dependency "ld-eventsource", "~> 2.2"
   spec.add_dependency "mono_logger", "~> 1.1"
   spec.add_dependency "openid_connect", "~> 2.2"

data/lib/forest_admin_agent/auth/oauth2/forest_resource_owner.rb

@@ -1,5 +1,4 @@
-require 'active_support'
-require 'active_support/core_ext/numeric/time'
+require 'date'
 require 'jwt'
 
 module ForestAdminAgent
@@ -16,21 +15,19 @@ module ForestAdminAgent
         end
 
         def expiration_in_seconds
-          Time.now.to_i + 1.hour
+          (DateTime.now + (1 / 24.0)).to_time.to_i
         end
 
         def make_jwt
           attributes = @data['attributes']
-
           user = {
             id: id,
             email: attributes['email'],
             first_name: attributes['first_name'],
             last_name: attributes['last_name'],
             team: attributes['teams'][0],
-            role: attributes['role'],
             tags: attributes['tags'],
-            rendering_id: @rendering_id.to_s,
+            rendering_id: @rendering_id,
             exp: expiration_in_seconds,
             permission_level: attributes['permission_level']
           }

data/lib/forest_admin_agent/builder/agent_factory.rb

@@ -11,7 +11,6 @@ module ForestAdminAgent
       include ForestAdminDatasourceCustomizer::DSL::DatasourceHelpers
 
       attr_reader :customizer, :container, :has_env_secret
-      attr_accessor :schema_only_mode
 
       def setup(options)
         @options = options
@@ -56,22 +55,7 @@ module ForestAdminAgent
         # Reset route cache to ensure routes are computed with all customizations
         ForestAdminAgent::Http::Router.reset_cached_routes!
 
-        if @schema_only_mode
-          generate_schema_only
-        else
-          send_schema
-        end
-      end
-
-      def generate_schema_only
-        datasource = @container.resolve(:datasource)
-        schema = build_schema(datasource)
-        schema_path = Facades::Container.cache(:schema_path)
-
-        write_schema_file(schema_path, schema)
-        @logger.log('Info', "[ForestAdmin] Schema generated successfully at #{schema_path}")
-
-        schema
+        send_schema
       end
 
       def reload!
@@ -99,24 +83,6 @@ module ForestAdminAgent
 
         return unless @has_env_secret
 
-        schema = generate_schema_file
-
-        if (append_schema_path = Facades::Container.cache(:append_schema_path))
-          begin
-            append_schema_file = JSON.parse(File.read(append_schema_path), symbolize_names: true)
-            schema[:collections] = schema[:collections] + append_schema_file[:collections]
-          rescue StandardError => e
-            raise "Can't load additional schema #{append_schema_path}: #{e.message}"
-          end
-        end
-
-        post_schema(schema, force)
-      end
-
-      # Generates or loads the schema and writes it to file (in development mode).
-      # This method can be overridden by subclasses that need to customize schema handling.
-      # @return [Hash] The schema hash with :meta and :collections keys
-      def generate_schema_file
         schema_path = Facades::Container.cache(:schema_path)
 
         if Facades::Container.cache(:is_production)
@@ -127,33 +93,29 @@ module ForestAdminAgent
             )
           end
 
-          JSON.parse(File.read(schema_path), symbolize_names: true)
+          schema = JSON.parse(File.read(schema_path), symbolize_names: true)
         else
-          datasource = @container.resolve(:datasource)
-          schema = build_schema(datasource)
-          write_schema_file(schema_path, schema)
-          schema
+          generated = SchemaEmitter.generate(@container.resolve(:datasource))
+          meta = SchemaEmitter.meta
+
+          schema = {
+            meta: meta,
+            collections: generated
+          }
+
+          File.write(schema_path, format_schema_json(schema))
         end
-      end
 
-      # Builds the schema hash from the datasource
-      # @param datasource [Object] The datasource to generate schema from
-      # @return [Hash] The schema hash with :meta and :collections keys
-      def build_schema(datasource)
-        generated = SchemaEmitter.generate(datasource)
-        meta = SchemaEmitter.meta
-
-        {
-          meta: meta,
-          collections: generated
-        }
-      end
+        if (append_schema_path = Facades::Container.cache(:append_schema_path))
+          begin
+            append_schema_file = JSON.parse(File.read(append_schema_path), symbolize_names: true)
+            schema[:collections] = schema[:collections] + append_schema_file[:collections]
+          rescue StandardError => e
+            raise "Can't load additional schema #{append_schema_path}: #{e.message}"
+          end
+        end
 
-      # Writes the schema to a file
-      # @param schema_path [String] Path to write the schema file
-      # @param schema [Hash] The schema to write
-      def write_schema_file(schema_path, schema)
-        File.write(schema_path, format_schema_json(schema))
+        post_schema(schema, force)
       end
 
       private
@@ -177,7 +139,9 @@ module ForestAdminAgent
         should_send = do_server_want_schema(api_map[:meta][:schemaFileHash])
 
         if should_send || force
-          send_schema_to_server(api_map)
+          client = ForestAdminAgent::Http::ForestAdminApiRequester.new
+          client.post('/forest/apimaps', api_map.to_json)
+          ForestAdminAgent::Facades::Container.logger.log('Info', 'schema was updated, sending new version')
         else
           @container.resolve(:logger)
           ForestAdminAgent::Facades::Container.logger.log('Info', 'Schema was not updated since last run')
@@ -219,17 +183,6 @@ module ForestAdminAgent
         @options[:logger] = clean_option_value(@options[:logger], 'config.logger =')
 
         @container.register(:config, @options.to_h)
-
-        configure_rpc_polling_pool if @options[:rpc_max_polling_threads]
-      end
-
-      def configure_rpc_polling_pool
-        max_threads = @options[:rpc_max_polling_threads].to_i
-        return unless max_threads.positive?
-
-        return unless defined?(ForestAdminDatasourceRpc)
-
-        ForestAdminDatasourceRpc.configure_polling_pool(max_threads: max_threads)
       end
 
       def build_logger
@@ -255,25 +208,6 @@ module ForestAdminAgent
         @logger.log('Info',
                     "[ForestAdmin] Running in #{environment} mode")
       end
-
-      def send_schema_to_server(api_map)
-        ForestAdminAgent::Facades::Container.logger.log('Info', 'schema was updated, sending new version')
-        client = ForestAdminAgent::Http::ForestAdminApiRequester.new
-        client.post('/forest/apimaps', api_map.to_json)
-      rescue Faraday::Error => e
-        status = e.response[:status] if e.response
-        if status
-          ForestAdminAgent::Facades::Container.logger.log(
-            'Error',
-            "Failed to send schema: invalid request (HTTP #{status})"
-          )
-        else
-          ForestAdminAgent::Facades::Container.logger.log(
-            'Error',
-            'Failed to send schema: cannot reach ForestAdmin server'
-          )
-        end
-      end
     end
   end
 end

data/lib/forest_admin_agent/facades/container.rb

@@ -12,7 +12,7 @@ module ForestAdminAgent
       end
 
       def self.logger
-        instance&.resolve(:logger)
+        instance.resolve(:logger)
       end
 
       def self.config_from_cache

data/lib/forest_admin_agent/routes/capabilities/collections.rb

@@ -24,13 +24,11 @@ module ForestAdminAgent
             collection = datasource.get_collection(collection_name)
             {
               name: collection.name,
-              fields: collection.schema[:fields].filter_map do |name, field|
-                next unless field.is_a?(ColumnSchema)
-
+              fields: collection.schema[:fields].select { |_, field| field.is_a?(ColumnSchema) }.map do |name, field|
                 {
                   name: name,
                   type: field.column_type,
-                  operators: field.filter_operators.to_a
+                  operators: field.filter_operators.map { |operator| operator }
                 }
               end
             }

data/lib/forest_admin_agent/serializer/forest_serializer.rb

@@ -29,7 +29,10 @@ module ForestAdminAgent
           @options[:class_name].gsub('::', '__')
         )
         primary_keys = ForestAdminDatasourceToolkit::Utils::Schema.primary_keys(forest_collection)
-        primary_keys.map { |key| @object[key] }.join('|')
+        id = []
+        primary_keys.each { |key| id << @object[key] }
+
+        id.join('|')
       end
 
       def format_name(attribute_name)

data/lib/forest_admin_agent/services/permissions.rb

@@ -263,7 +263,7 @@ module ForestAdminAgent
       def find_action_from_endpoint(collection_name, path, http_method)
         endpoint = path.partition('/forest/')[1..].join
         schema_file = JSON.parse(File.read(Facades::Container.config_from_cache[:schema_path]))
-        actions = schema_file['collections']&.find { |collection| collection['name'] == collection_name }&.dig('actions')
+        actions = schema_file['collections']&.select { |collection| collection['name'] == collection_name }&.first&.dig('actions')
 
         return nil if actions.nil? || actions.empty?
 

data/lib/forest_admin_agent/utils/context_variables.rb

@@ -30,11 +30,9 @@ module ForestAdminAgent
 
         if context_variable_key.start_with?(USER_VALUE_TAG_PREFIX)
           tag_key = context_variable_key[USER_VALUE_TAG_PREFIX.length..]
-          tags = user[:tags]
-          return nil if tags.nil?
-
-          value = tags[tag_key] || tags[tag_key.to_sym]
-          return value
+          user[:tags].each do |tag|
+            return tag['value'] if tag['key'] == tag_key
+          end
         end
 
         user[context_variable_key[USER_VALUE_PREFIX.length..].to_sym]

data/lib/forest_admin_agent/utils/query_string_parser.rb

@@ -40,11 +40,10 @@ module ForestAdminAgent
         add_polymorphic_type_fields(collection, requested_field_names)
         projection_fields = build_projection_fields(collection, requested_field_names, args)
 
-        ForestAdminDatasourceToolkit::Validations::ProjectionValidator.validate?(collection, projection_fields)
+        projection = Projection.new(projection_fields)
+        ForestAdminDatasourceToolkit::Validations::ProjectionValidator.validate?(collection, projection)
 
-        Projection.new(projection_fields)
-      rescue ForestAdminDatasourceToolkit::Exceptions::ForestException => e
-        raise BadRequestError, "Invalid projection: #{e.message}"
+        projection
       end
 
       def self.add_polymorphic_type_fields(collection, requested_field_names)
@@ -64,31 +63,17 @@ module ForestAdminAgent
 
       def self.build_projection_fields(collection, requested_field_names, args)
         requested_field_names.map do |field_name|
-          field = get_field(collection, field_name)
-
-          case field.type
-          when 'Column'
+          column = collection.schema[:fields][field_name]
+          if column.type == 'Column'
             field_name
-          when 'PolymorphicManyToOne'
+          elsif column.type == 'PolymorphicManyToOne'
             "#{field_name}:*"
           else
-            relation_fields = args.dig(:params, :fields, field_name)
-            "#{field_name}:#{relation_fields}"
+            "#{field_name}:#{args[:params][:fields][field_name]}"
           end
         end
       end
-
-      def self.get_field(collection, field_name)
-        field = collection.schema[:fields][field_name]
-        return field unless field.nil?
-
-        available_fields = collection.schema[:fields].keys.join(', ')
-        raise ForestAdminDatasourceToolkit::Exceptions::ValidationError,
-              "The '#{collection.name}.#{field_name}' field was not found. " \
-              "Available fields are: [#{available_fields}]. " \
-              'Please check if the field name is correct.'
-      end
-      private_class_method :add_polymorphic_type_fields, :build_projection_fields, :get_field
+      private_class_method :add_polymorphic_type_fields, :build_projection_fields
 
       def self.parse_projection_with_pks(collection, args)
         projection = parse_projection(collection, args)

data/lib/forest_admin_agent/utils/schema/frontend_filterable.rb

@@ -5,12 +5,6 @@ module ForestAdminAgent
         def self.filterable?(operator)
           operator && !operator.empty?
         end
-
-        def self.sort_operators(operators)
-          return operators unless operators.is_a?(Array)
-
-          operators.sort
-        end
       end
     end
   end

data/lib/forest_admin_agent/utils/schema/generator_action.rb

@@ -29,9 +29,8 @@ module ForestAdminAgent
           action = collection.schema[:actions][name]
           action_index = collection.schema[:actions].keys.index(name)
           slug = get_action_slug(name)
-
+          form_elements = extract_fields_and_layout(collection.get_form(nil, name))
           if action.static_form
-            form_elements = extract_fields_and_layout(collection.get_form(nil, name))
             fields = build_fields(collection, form_elements[:fields])
             layout = form_elements[:layout]
           else

data/lib/forest_admin_agent/utils/schema/schema_emitter.rb

@@ -6,7 +6,7 @@ module ForestAdminAgent
     module Schema
       class SchemaEmitter
         LIANA_NAME = "agent-ruby"
-        LIANA_VERSION = "1.24.10"
+        LIANA_VERSION = "2.0.0"
 
         def self.generate(datasource)
           datasource.collections

data/lib/forest_admin_agent/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminAgent
-  VERSION = "1.24.10"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_agent
 version: !ruby/object:Gem::Version
-  version: 1.24.10
+  version: 2.0.0
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-02 00:00:00.000000000 Z
+date: 2025-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,20 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: benchmark
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
@@ -67,20 +53,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cgi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement
@@ -109,20 +81,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.5
-- !ruby/object:Gem::Dependency
-  name: logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mutex_m
   requirement: !ruby/object:Gem::Requirement
@@ -227,14 +185,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: ld-eventsource
   requirement: !ruby/object:Gem::Requirement