Merge pull request #696 from City-of-Helsinki/dev

Dev to main

Author: hyrsky

composer.lock

@@ -5,7 +5,7 @@ dependencies:
   module:
     - helfi_paragraphs_curated_event_list
 _core:
-  default_config_hash: wFxMtKO0kHIXPfffgfXJ2LtbfSgv-zt7aPMqXTE01Qk
+  default_config_hash: 2zKdeRcO2ycvpjuAJQM15t8LEk8Eai78fvP6uY4XEyk
 id: linkedevents_event
 label: 'LinkedEvents: Event'
 label_plural: 'LinkedEvents: Events'
@@ -160,7 +160,7 @@ data_aggregator:
         config: {  }
 data_aggregator_notes: ''
 language_settings: {  }
-persistent_cache_max_age: 0
+persistent_cache_max_age: 1800
 annotation_entity_type_id: null
 annotation_bundle_id: null
 annotation_field_name: null

conf/cmi/external_entities.external_entity_type.linkedevents_event.yml

@@ -0,0 +1,5 @@
+_core:
+  default_config_hash: zQC2Os_pPJKHCNS0XBZObooCwT87MT6v5janEJ8_rt4
+enable: false
+expire_after: null
+directives: null

conf/cmi/helfi_platform_config.clear_site_data.yml

@@ -0,0 +1,6 @@
+openai_models:
+  - text-embedding-3-small
+  - text-embedding-3-large
+openai_model_pricing:
+  text-embedding-3-small: 0.02
+  text-embedding-3-large: 0.13

conf/cmi/helfi_search.settings.yml

@@ -1,5 +1,6 @@
 _core:
   default_config_hash: kO5fDGTDu1JqYpxKrtzjdzwObU2Ko_3CxABNjqBbYos
+langcode: en
 attributes:
   icon:
     label: ''

conf/cmi/menu_link_attributes.config.yml

@@ -13,9 +13,7 @@ settings:
   client_id: ''
   client_secret: ''
   iss_allowed_domains: ''
-  prompt:
-    login: login
-  auto_login: 0
+  prompt: {  }
   environment_url: ''
   client_scopes: 'openid,email'
   client_roles: {  }

conf/cmi/openid_connect.client.tunnistamo.yml

@@ -5,6 +5,7 @@ dependencies:
   config:
     - search_api.server.etusivu
   module:
+    - helfi_platform_config
     - helfi_react_search
     - helfi_recommendations
     - helfi_search
@@ -15,10 +16,18 @@ name: 'Vector embeddings'
 description: ''
 read_only: false
 field_settings:
-  embeddings:
-    label: Embeddings
-    property_path: embeddings
+  embeddings_text_embedding_3_large:
+    label: 'Embeddings (text-embedding-3-large)'
+    property_path: embeddings_text_embedding_3_large
     type: embeddings
+  embeddings_text_embedding_3_small:
+    label: 'Embeddings (text-embedding-3-small)'
+    property_path: embeddings_text_embedding_3_small
+    type: embeddings
+  entity_bundle:
+    label: 'Entity bundle'
+    property_path: helfi_entity_bundle
+    type: string
   entity_type:
     label: 'Entity type'
     property_path: search_api_entity_type
@@ -73,7 +82,7 @@ tracker_settings:
   default:
     indexing_order: fifo
 options:
-  cron_limit: 1
+  cron_limit: 5
   delete_on_fail: true
   index_directly: false
   track_changes_in_references: true