etna 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9118a99396cf2b041083ff982fb680a5d60096802699789962d19bcf3fecf41d
-  data.tar.gz: 3145994427f0fa57bf796e68dfe4e69156eb407f144a6afe048bd17454201949
+  metadata.gz: 1e8722ab25f18920f6d9b101d3fb78d52e03a7ffbb884da89b5942c0f3985bb1
+  data.tar.gz: 24547dbfc711d1a97cdad56302f1e29ebd6b3bdd6286ca046b34619c134137a5
 SHA512:
-  metadata.gz: ec59fd21bcf8bb88848e0c8c628a0185226d7dd7ee1af79525a790ac2117fe2b7d44b9d3e514717e9c23233bd531c9d3c8404981892174adbeee221e62118c33
-  data.tar.gz: bf0cc8cea804bb218e7f487ea014c84e394738760dc400de1c716b780da6a668ca5f853a72acfff7a77cd979f4a90004a866cdd16cb26a008a3498c83161fd71
+  metadata.gz: c878e9867cd036b302bacb0040003f803003760b5445c482797a1e7045b8421852e0f4326916f62d02e4a12e182930b90f06c4f5a66c5baa5a7d1c5c153ef047
+  data.tar.gz: c40d34810aef6d6de593732401842d29aa0bd2f33774a439e36713b6736c05a19539e616d3473a73db3104a97f3a89f6c59bfe8aaf6942a013df86eb03f6225c

data/lib/etna/clients/magma/workflows/crud_workflow.rb

@@ -48,8 +48,16 @@ module Etna
 
               retry
             rescue Etna::Error => e
-              raise e unless e.message.include?('not found')
-              break
+              if e.status === 502
+                if attempts > 5
+                  raise e
+                end
+
+                retry
+              else
+                raise e unless e.message.include?('not found')
+                break
+              end
             end
 
             documents += last_page.models.model(model_name).documents unless block_given?

data/lib/etna/clients/magma/workflows/materialize_magma_record_files_workflow.rb

@@ -34,7 +34,7 @@ module Etna
               record_names,
               model_attributes_mask: model_attributes_mask,
               model_filters: model_filters,
-              page_size: 500,
+              page_size: 20,
           ) do |template, document|
             logger&.info("Materializing #{template.name}##{document[template.identifier]}")
             templates[template.name] = template

data/lib/etna/clients/magma/workflows/update_attributes_from_csv_workflow.rb

@@ -241,7 +241,13 @@ module Etna
                 attribute_name_clean = attribute_name.strip
                 raise "Invalid attribute \"#{attribute_name_clean}\" for model #{@model_name}." unless attribute = @workflow.find_attribute(@model_name, attribute_name_clean)
 
-                attributes[attribute_name_clean] = stripped_value(attribute, @raw[attribute_name])
+                stripped = stripped_value(attribute, @raw[attribute_name])
+                
+                unless @workflow.hole_value.nil?
+                  next if stripped == @workflow.hole_value
+                end
+                
+                attributes[attribute_name_clean] = stripped
               end
             end
           end

data/lib/etna/clients/magma/workflows/walk_model_tree_workflow.rb

@@ -9,6 +9,27 @@ module Etna
       class WalkModelTreeWorkflow < Struct.new(:magma_crud, :logger, keyword_init: true)
         def initialize(**args)
           super(**({}.update(args)))
+          @template_for = {}
+        end
+
+        def masked_attributes(template:, model_attributes_mask:, model_name:)
+          attributes_mask = model_attributes_mask[model_name]
+          return ["all", "all"] if attributes_mask.nil?
+          [(attributes_mask + [template.identifier, 'parent']).uniq, attributes_mask]
+        end
+
+        def attribute_included?(mask, attribute_name)
+          return true if mask == "all"
+          mask.include?(attribute_name)
+        end
+
+        def template_for(model_name)
+          @template_for[model_name] ||= magma_crud.magma_client.retrieve(RetrievalRequest.new(
+              project_name: magma_crud.project_name,
+              model_name: model_name,
+              record_names: [],
+              attribute_names: [],
+          )).models.model(model_name).template
         end
 
         def walk_from(
@@ -26,29 +47,30 @@ module Etna
             next if seen.include?([path[:from], model_name])
             seen.add([path[:from], model_name])
 
+            template = template_for(model_name)
+            query_attributes, walk_attributes = masked_attributes(template: template, model_attributes_mask: model_attributes_mask, model_name: model_name)
+
             request = RetrievalRequest.new(
                 project_name: magma_crud.project_name,
                 model_name: model_name,
                 record_names: path[:record_names],
                 filter: model_filters[model_name],
+                attribute_names: query_attributes,
                 page_size: page_size, page: 1
             )
 
             related_models = {}
 
             magma_crud.page_records(model_name, request) do |response|
-              model = response.models.model(model_name)
-              template = model.template
-
               tables = []
               collections = []
               links = []
               attributes = []
 
+              model = response.models.model(model_name)
+
               template.attributes.attribute_keys.each do |attr_name|
-                attributes_mask = model_attributes_mask[model_name]
-                black_listed = !attributes_mask.nil? && !attributes_mask.include?(attr_name)
-                next if black_listed && attr_name != template.identifier && attr_name != 'parent'
+                next unless attribute_included?(query_attributes, attr_name)
                 attributes << attr_name
 
                 attr = template.attributes.attribute(attr_name)
@@ -63,7 +85,7 @@ module Etna
                 elsif attr.attribute_type == AttributeType::CHILD
                   related_models[attr.link_model_name] ||= Set.new
                   links << attr_name
-                elsif attr.attribute_type == AttributeType::PARENT && !black_listed
+                elsif attr.attribute_type == AttributeType::PARENT && attribute_included?(walk_attributes, attr_name)
                   related_models[attr.link_model_name] ||= Set.new
                   links << attr_name
                 end

data/lib/etna/clients/metis/client.rb

@@ -69,6 +69,11 @@ module Etna
           @etna_client.folder_remove(delete_folder_request.to_h))
       end
 
+      def delete_file(delete_file_request)
+        FilesResponse.new(
+          @etna_client.file_remove(delete_file_request.to_h))
+      end
+
       def find(find_request)
         FoldersAndFilesResponse.new(
           @etna_client.bucket_find(find_request.to_h))

data/lib/etna/clients/metis/models.rb

@@ -95,6 +95,21 @@ module Etna
         end
       end
 
+      class DeleteFileRequest < Struct.new(:project_name, :bucket_name, :file_path, keyword_init: true)
+        include JsonSerializableStruct
+
+        def initialize(**params)
+          super({}.update(params))
+        end
+
+        def to_h
+          # The :project_name comes in from Polyphemus as a symbol value,
+          #   we need to make sure it's a string because it's going
+          #   in the URL.
+          super().compact.transform_values(&:to_s)
+        end
+      end
+
       class FindRequest < Struct.new(:project_name, :bucket_name, :limit, :offset, :params, keyword_init: true)
         include JsonSerializableStruct
 

data/lib/etna/user.rb

@@ -46,7 +46,7 @@ module Etna
       viewer: /[Vv]/,
       restricted: /[AEV]/,
     }
-    def has_roles(project, *roles)
+    def has_any_role?(project, *roles)
       perm = permissions[project.to_s]
 
       return false unless perm
@@ -55,15 +55,23 @@ module Etna
     end
 
     def is_superuser? project=nil
-      has_roles(:administration, :admin)
+      has_any_role?(:administration, :admin)
+    end
+
+    def is_supereditor? project=nil
+      has_any_role?(:administration, :admin, :editor)
+    end
+
+    def is_superviewer? project=nil
+      has_any_role?(:administration, :admin, :editor, :viewer)
     end
 
     def can_edit? project
-      is_superuser? || has_roles(project, :admin, :editor)
+      is_supereditor? || has_any_role?(project, :admin, :editor)
     end
 
     def can_view? project
-      is_superuser? || has_roles(project, :admin, :editor, :viewer)
+      is_superviewer? || has_any_role?(project, :admin, :editor, :viewer)
     end
 
     # superusers - administrators of the Administration group - cannot
@@ -75,7 +83,7 @@ module Etna
     end
 
     def is_admin? project
-      is_superuser? || has_roles(project, :admin)
+      is_superuser? || has_any_role?(project, :admin)
     end
 
     def active? project=nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etna
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.31
 platform: ruby
 authors:
 - Saurabh Asthana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack