hyrax 4.0.0 → 5.0.0.rc2

data/chart/hyrax/values.yaml

@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: samveralabs/dassie
+  repository: ghcr.io/samvera/hyrax/dassie
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
@@ -119,6 +119,7 @@ externalPostgresql: {}
 #  username:
 #  password:
 #  database:
+#  port:
 
 embargoRelease:
   enabled: true
@@ -193,7 +194,7 @@ worker:
   enabled: true
   replicaCount: 3
   image:
-    repository: samveralabs/dassie-worker
+    repository: ghcr.io/samvera/hyrax/dassie-worker
     pullPolicy: IfNotPresent
     tag: ""
   extraInitContainers: []
@@ -220,19 +221,35 @@ worker:
 
 fcrepo:
   enabled: true
-  externalDatabaseUsername: "hyrax"
   servicePort: 8080
   postgresql:
     enabled: false
     image:
       repository: bitnami/postgresql
-      tag: 12.3.0
+      tag: 12.11.0-debian-11-r12
+
+# configuration for an external/existing fits service;
+#   ignored if `fits.enabled` is true
+externalFits:
+  enabled: false
+  url: "" # existing FITS servlet endpoint
+
+fits:
+  enabled: true
+  servicePort: 8080
+  subPath: /fits
 
 memcached:
   enabled: false
+  image:
+    repository: bitnami/memcached
+    tag: 1.6.15-debian-11-r12
 
 minio:
   enabled: false
+  image:
+    repository: bitnami/minio
+    tag: 2022.7.4-debian-11-r0
   auth:
     rootUser: hyrax-access-key
     rootPassword: hyrax-secret-key
@@ -244,11 +261,13 @@ postgresql:
   enabled: true
   image:
     repository: bitnami/postgresql
-    tag: 12.3.0
+    tag: 12.11.0-debian-11-r12
   auth:
     database: hyrax
     password: hyrax_pass
     username: hyrax
+  containerPorts:
+    postgresql: 5432
   primary:
     service:
       ports:
@@ -262,12 +281,11 @@ postgresql:
 ## and to act as an auth proxy for Cantelope
 nginx:
   enabled: false
+  image:
+    repository: bitnami/nginx
+    tag: 1.23.0-debian-11-r1
   # The set up below does malicious bot / ip blocking and mounts
-  # vaolumes to allow nginx to server assets and other public directory items
-  # image:
-  #   registry: registry.gitlab.com
-  #   repository: notch8/scripts/bitnami-nginx
-  #   tag: 1.21.5-debian-10-r4
+  # volumes to allow nginx to server assets and other public directory items
   # extraVolumes:
   #   - name: "uploads"
   #     persistentVolumeClaim:
@@ -397,6 +415,9 @@ nginx:
 
 redis:
   enabled: true
+  image:
+    repository: bitnami/redis
+    tag: 7.0.2-debian-11-r7
   auth:
     password: mysecret
 
@@ -404,12 +425,14 @@ solr:
   enabled: true
   image:
     repository: bitnami/solr
-    tag: 8.11.1
+    tag: 8.11.2-debian-11-r4
+  containerPorts:
+    http: 8983
   auth:
     enabled: true
     adminUsername: admin
     adminPassword: admin
-  coreName: hyrax
+  coreNames: hyrax
   collection: hyrax
   cloudBootstrap: true
   cloudEnabled: true
@@ -428,9 +451,11 @@ autoscaling:
   # targetMemoryUtilizationPercentage: 80
 
 global:
+  # These global postgresql values are used by the fcrepo chart
   postgresql:
-    postgresqlUsername: hyrax
-    postgresqlPassword: hyrax_pass
+    auth:
+      username: hyrax
+      password: hyrax_pass
   # This is th name of the running rails server pod
   hyraxHostName: hyrax
 

data/config/initializers/file_length_patch.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+# Valkyrie::Storage::Fedora expects io objects to have #length
+class ::File
+  alias length size unless respond_to? :length
+end
+
+class ::Valkyrie::StorageAdapter::StreamFile
+  alias length size unless respond_to? :length
+end

data/config/initializers/listeners.rb

@@ -1,16 +1,10 @@
 # frozen_string_literal: true
 
-Hyrax.publisher.subscribe(Hyrax::Listeners::AclIndexListener.new)
 Hyrax.publisher.subscribe(Hyrax::Listeners::ActiveFedoraAclIndexListener.new) unless Hyrax.config.disable_wings
-Hyrax.publisher.subscribe(Hyrax::Listeners::BatchNotificationListener.new)
-Hyrax.publisher.subscribe(Hyrax::Listeners::FileMetadataListener.new)
-Hyrax.publisher.subscribe(Hyrax::Listeners::FileSetLifecycleListener.new)
-Hyrax.publisher.subscribe(Hyrax::Listeners::FileSetLifecycleNotificationListener.new)
-Hyrax.publisher.subscribe(Hyrax::Listeners::MemberCleanupListener.new)
-Hyrax.publisher.subscribe(Hyrax::Listeners::MetadataIndexListener.new)
-Hyrax.publisher.subscribe(Hyrax::Listeners::ObjectLifecycleListener.new)
-Hyrax.publisher.subscribe(Hyrax::Listeners::TrophyCleanupListener.new)
-Hyrax.publisher.subscribe(Hyrax::Listeners::WorkflowListener.new)
+
+Hyrax.publisher.default_listeners.each do |listener|
+  Hyrax.publisher.subscribe(listener)
+end
 
 # Publish events from old style Hyrax::Callbacks to trigger the listeners
 # When callbacks are removed and replaced with direct event publication, drop these blocks

data/config/initializers/storage_adapter_initializer.rb

@@ -7,6 +7,6 @@ Valkyrie::StorageAdapter.register(
 )
 
 Valkyrie::StorageAdapter.register(
-  Valkyrie::Storage::Disk.new(base_path: Hyrax.config.derivatives_path),
+  Valkyrie::Storage::Disk.new(base_path: Hyrax.config.derivatives_path, path_generator: Hyrax::DerivativeBucketedStorage),
   :derivatives_disk
 )

data/config/locales/hyrax.en.yml

@@ -459,6 +459,14 @@ en:
       workflows:
         index:
           header: Review Submissions
+          heading:
+            work: Work
+            depositor: Depositor
+            submission_date: Submission Date
+            status: status
+          works_published: "<strong>%{total_count} works</strong> published"
+          works_under_review: "<strong>%{total_count} works</strong> under review"
+          works_listing: Works listing
           tabs:
             published: Published
             under_review: Under Review

data/config/metadata/basic_metadata.yaml

@@ -1,19 +1,35 @@
+---
 attributes:
   abstract:
     type: string
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "abstract_tesim"
+    predicate: http://purl.org/dc/terms/abstract
   access_right:
     type: string
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "access_right_tesim"
+    predicate: http://purl.org/dc/terms/accessRights
   alternative_title:
     type: string
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "alternative_title_tesim"
+    predicate: http://purl.org/dc/terms/alternative
+  arkivo_checksum:
+    type: string
+    multiple: false
+    form:
+      primary: false
+    predicate: http://scholarsphere.psu.edu/ns#arkivoChecksum
   based_near:
     type: string
     multiple: true
@@ -22,14 +38,19 @@ attributes:
     index_keys:
       - "based_near_sim"
       - "based_near_tesim"
+    predicate: http://xmlns.com/foaf/0.1/based_near
   bibliographic_citation:
     type: string
     multiple: true
+    predicate: http://purl.org/dc/terms/bibliographicCitation
   contributor:
     type: string
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "contributor_tesim"
+    predicate: http://purl.org/dc/elements/1.1/contributor
   creator:
     type: string
     multiple: true
@@ -38,6 +59,7 @@ attributes:
       primary: true
     index_keys:
       - "creator_tesim"
+    predicate: http://purl.org/dc/elements/1.1/creator
   date_created:
     type: date_time
     multiple: true
@@ -45,6 +67,7 @@ attributes:
       primary: false
     index_keys:
       - "date_created_tesim"
+    predicate: http://purl.org/dc/terms/created
   description:
     type: string
     multiple: true
@@ -52,13 +75,18 @@ attributes:
       primary: false
     index_keys:
       - "description_tesim"
+    predicate: http://purl.org/dc/elements/1.1/description
   identifier:
     type: string
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "identifier_tesim"
+    predicate: http://purl.org/dc/terms/identifier
   import_url:
     type: string
+    predicate: http://scholarsphere.psu.edu/ns#importUrl
   keyword:
     type: string
     multiple: true
@@ -67,27 +95,41 @@ attributes:
       - "keyword_tesim"
     form:
       primary: false
+    predicate: http://schema.org/keywords
   publisher:
     type: string
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "publisher_tesim"
+    predicate: http://purl.org/dc/elements/1.1/publisher
   label:
     type: string
     form:
       primary: false
+    index_keys:
+      - "label_tesim"
+    predicate: info:fedora/fedora-system:def/model#downloadFilename
   language:
     type: string
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "language_tesim"
+    predicate: http://purl.org/dc/elements/1.1/language
   license:
     type: string
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "license_tesim"
+    predicate: http://purl.org/dc/terms/license
   relative_path:
     type: string
+    predicate: http://scholarsphere.psu.edu/ns#relativePath
   related_url:
     type: string
     multiple: true
@@ -95,6 +137,7 @@ attributes:
       primary: false
     index_keys:
       - "related_url_tesim"
+    predicate: http://www.w3.org/2000/01/rdf-schema#seeAlso
   resource_type:
     type: string
     multiple: true
@@ -103,11 +146,15 @@ attributes:
     index_keys:
       - "resource_type_sim"
       - "resource_type_tesim"
+    predicate: http://purl.org/dc/terms/type
   rights_notes:
     type: string
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "rights_notes_tesim"
+    predicate: http://purl.org/dc/elements/1.1/rights
   rights_statement:
     type: string
     multiple: true
@@ -115,11 +162,15 @@ attributes:
       primary: true
     index_keys:
       - "rights_statement_tesim"
+    predicate: http://www.europeana.eu/schemas/edm/rights
   source:
     type: string
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "source_tesim"
+    predicate: http://purl.org/dc/terms/source
   subject:
     type: string
     multiple: true
@@ -128,3 +179,4 @@ attributes:
       - "subject_tesim"
     form:
       primary: false
+    predicate: http://purl.org/dc/elements/1.1/subject

data/config/metadata/core_metadata.yaml

@@ -9,9 +9,13 @@ attributes:
       required: true
       primary: true
       multiple: true
+    predicate: http://purl.org/dc/terms/title
   date_modified:
     type: date_time
+    predicate: http://purl.org/dc/terms/modified
   date_uploaded:
     type: date_time
+    predicate: http://purl.org/dc/terms/dateSubmitted
   depositor:
     type: string
+    predicate: http://id.loc.gov/vocabulary/relators/dpt

data/config/metadata/file_set_metadata.yaml

@@ -12,17 +12,20 @@ attributes:
       primary: true
     index_keys:
       - "creator_tesim"
+    predicate: http://purl.org/dc/elements/1.1/creator
   license:
     type: string
     multiple: true
     form:
-      required: true
+      required: false
       primary: true
+    predicate: http://purl.org/dc/terms/license
 
   # Other attributes:
   abstract:
     type: string
     multiple: true
+    predicate: http://purl.org/dc/terms/abstract
   # form:
   #   primary: false
   # missing: access_right
@@ -35,12 +38,14 @@ attributes:
     index_keys:
       - "based_near_sim"
       - "based_near_tesim"
+    predicate: http://xmlns.com/foaf/0.1/based_near
   # missing: bibliograpic_citation
   contributor:
     type: string
     multiple: true
     form:
       primary: false
+    predicate: http://purl.org/dc/elements/1.1/contributor
   # required: creator
   date_created:
     type: date_time
@@ -49,6 +54,7 @@ attributes:
       primary: false
     index_keys:
       - "date_created_tesim"
+    predicate: http://purl.org/dc/terms/created
   description:
     type: string
     multiple: true
@@ -56,11 +62,13 @@ attributes:
       primary: false
     index_keys:
       - "description_tesim"
+    predicate: http://purl.org/dc/elements/1.1/description
   identifier:
     type: string
     multiple: true
     form:
       primary: false
+    predicate: http://purl.org/dc/terms/identifier
   # missing: import_url
   keyword:
     type: string
@@ -70,9 +78,11 @@ attributes:
     index_keys:
       - "keyword_sim"
       - "keyword_tesim"
+    predicate: http://schema.org/keywords
   # missing: publisher
   label:
     type: string
+    predicate: info:fedora/fedora-system:def/model#downloadFilename
   # form:
   #   primary: false
   language:
@@ -80,12 +90,14 @@ attributes:
     multiple: true
     form:
       primary: false
+    predicate: http://purl.org/dc/elements/1.1/language
   # required: license
   publisher:
     type: string
     multiple: true
     form:
       primary: false
+    predicate: http://purl.org/dc/elements/1.1/publisher
   related_url:
     type: string
     multiple: true
@@ -93,8 +105,10 @@ attributes:
       primary: false
     index_keys:
       - "related_url_tesim"
+    predicate: http://www.w3.org/2000/01/rdf-schema#seeAlso
   relative_path:
     type: string
+    predicate: http://scholarsphere.psu.edu/ns#relativePath
   resource_type:
     type: string
     multiple: true
@@ -103,9 +117,11 @@ attributes:
     index_keys:
       - "resource_type_sim"
       - "resource_type_tesim"
+    predicate: http://purl.org/dc/terms/type
   rights_notes:
     type: string
     multiple: true
+    predicate: http://purl.org/dc/elements/1.1/rights
   # form:
   #   primary: false
   rights_statement:
@@ -115,9 +131,11 @@ attributes:
   #   primary: true
     index_keys:
       - "rights_statement_tesim"
+    predicate: http://www.europeana.eu/schemas/edm/rights
   source:
     type: string
     multiple: true
+    predicate: http://purl.org/dc/terms/source
   # form:
   #   primary: false
   subject:
@@ -128,3 +146,4 @@ attributes:
     index_keys:
       - "subject_sim"
       - "subject_tesim"
+    predicate: http://purl.org/dc/elements/1.1/subject

data/config/metadata/hyrax_internal_metadata.yaml

@@ -0,0 +1,57 @@
+---
+# This internal metadata config is used to define predicates for hyrax internals only
+attributes:
+  access_to:
+    predicate: http://www.w3.org/ns/auth/acl#accessTo
+  admin_set_id:
+    predicate: http://purl.org/dc/terms/isPartOf
+  agent:
+    predicate: http://www.w3.org/ns/auth/acl#agent
+  byte_order:
+    predicate: http://sweet.jpl.nasa.gov/2.2/reprDataFormat.owl#byteOrder
+  color_space:
+    predicate: http://www.w3.org/2003/12/exif/ns#colorSpace
+  compression:
+    predicate: http://vocabulary.samvera.org/ns#compressionScheme
+  created_at:
+    predicate: http://purl.org/dc/terms/created
+  file_identifier:
+    predicate: http://vocabulary.samvera.org/ns#fileIdentifier
+  file_ids:
+    predicate: http://pcdm.org/models#hasFile
+  file_set_id:
+    predicate: http://vocabulary.samvera.org/ns#fileSetId
+  format_label:
+    predicate: http://www.loc.gov/premis/rdf/v1#hasFormatName
+  height:
+    predicate: http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#height
+  id:
+    predicate: http://purl.org/dc/terms/id
+  internal_resource:
+    predicate: info:fedora/fedora-system:def/model#hasModel
+  mime_type:
+    predicate: http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#hasMimeType
+  mode:
+    predicate: http://www.w3.org/ns/auth/acl#mode
+  original_filename:
+    predicate: http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#filename
+  pcdm_use:
+    predicate: http://vocabulary.samvera.org/ns#pcdmUse
+  permissions:
+    predicate: http://vocabulary.samvera.org/ns#permissions
+  recorded_size:
+    predicate: http://www.loc.gov/premis/rdf/v1#hasSize
+  representative_id:
+    predicate: http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#hasRelatedMediaFragment
+  state:
+    predicate: http://fedora.info/definitions/1/0/access/ObjState#objState
+  thumbnail_id:
+    predicate: http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#hasRelatedImage
+  updated_at:
+    predicate: http://vocabulary.samvera.org/ns#updatedAt
+  valid:
+    predicate: http://vocabulary.samvera.org/ns#valid
+  well_formed:
+    predicate: http://vocabulary.samvera.org/ns#wellFormed
+  width:
+    predicate: http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#width

data/docker-compose-koppie.yml

@@ -6,10 +6,12 @@ services:
       context: .
       target: hyrax-engine-dev
       args:
-        - EXTRA_APK_PACKAGES=git less chromium
+        - EXTRA_APK_PACKAGES=git less
         - APP_PATH=.koppie
-    image: ghcr.io/samvera/koppie
-    command: sh -l -c 'bundle && yarn && bundle exec puma -v -b tcp://0.0.0.0:3000'
+        - BUNDLE_GEMFILE=Gemfile.koppie
+    image: samvera/koppie
+    entrypoint: dev-entrypoint.sh
+    command: sh -c 'bundle exec puma -v -b tcp://0.0.0.0:3000'
     stdin_open: true
     tty: true
     user: root
@@ -29,8 +31,10 @@ services:
       - 9877:9876
       - 1049:1048
     volumes:
+      - ./bin:/app/samvera
       - .koppie:/app/samvera/hyrax-webapp
       - .:/app/samvera/hyrax-engine
+      - bundle:/app/bundle
       - hyrax-storage:/app/samvera/hyrax-webapp/storage
       - hyrax-derivatives:/app/samvera/hyrax-webapp/derivatives
       - hyrax-uploads:/app/samvera/hyrax-webapp/uploads
@@ -40,13 +44,9 @@ services:
       - koppie
 
   sidekiq:
-    build:
-      context: .
-      target: hyrax-engine-dev-worker
-      args:
-        - APP_PATH=.koppie
-    image: ghcr.io/samvera/koppie-worker
-    command: sh -l -c 'bundle && bundle exec sidekiq'
+    image: samvera/koppie
+    entrypoint: dev-entrypoint.sh
+    command: sh -c 'bundle exec sidekiq'
     user: root
     env_file:
       - .koppie/.env
@@ -57,40 +57,42 @@ services:
       - redis
       - solr
     volumes:
+      - ./bin:/app/samvera
       - .koppie:/app/samvera/hyrax-webapp
       - .:/app/samvera/hyrax-engine
+      - bundle:/app/bundle
       - hyrax-storage:/app/samvera/hyrax-webapp/storage
       - hyrax-derivatives:/app/samvera/hyrax-webapp/derivatives
       - hyrax-uploads:/app/samvera/hyrax-webapp/uploads
-      - sidekiq-public:/app/samvera/hyrax-webapp/public
-      - sidekiq-tmp:/app/samvera/hyrax-webapp/tmp
+      - rails-public:/app/samvera/hyrax-webapp/public
+      - rails-tmp:/app/samvera/hyrax-webapp/tmp
     networks:
       - koppie
 
   db_migrate:
-    build:
-      context: .
-      target: hyrax-engine-dev
-      args:
-        - EXTRA_APK_PACKAGES=git less
-        - APP_PATH=.koppie
-    image: ghcr.io/samvera/koppie
+    image: samvera/koppie
     user: root
     env_file:
       - .koppie/.env
-    command: sh -l -c 'bundle && db-migrate-seed.sh'
+    entrypoint: dev-entrypoint.sh
+    command: db-migrate-seed.sh
     depends_on:
       - postgres
+      - solr
     volumes:
+      - ./bin:/app/samvera
       - .koppie:/app/samvera/hyrax-webapp
       - .:/app/samvera/hyrax-engine
+      - bundle:/app/bundle
       - rails-public:/app/samvera/hyrax-webapp/public
       - rails-tmp:/app/samvera/hyrax-webapp/tmp
     networks:
       - koppie
 
   chrome:
-    image: selenium/standalone-chrome:3.141
+    image: seleniarm/standalone-chromium:114.0
+    environment:
+      - START_XVFB=false
     logging:
       driver: none
     volumes:
@@ -103,7 +105,7 @@ services:
       - koppie
 
   postgres:
-    image: postgres:latest
+    image: postgres:15
     env_file:
       - .koppie/.env
     ports:
@@ -113,6 +115,13 @@ services:
     networks:
       - koppie
 
+  fits:
+    image: ghcr.io/samvera/fitsservlet:1.6.0
+    ports:
+      - 8080
+    networks:
+      - koppie
+
   memcached:
     image: bitnami/memcached
     ports:
@@ -140,10 +149,15 @@ services:
     volumes:
       - solr_home:/var/solr/data:cached
       - .koppie/solr/conf:/opt/solr/server/configsets/hyraxconf
+    ulimits:
+      nofile:
+        soft: 65536
+        hard: 524288
     networks:
       - koppie
 
 volumes:
+  bundle:
   db:
   hyrax-storage:
   hyrax-derivatives: