Use w3id.org PURL for schema ID

project/jsonld/dcat_ap_plus.context.jsonld

@@ -1,7 +1,7 @@
 {
    "comments": {
       "description": "Auto generated by LinkML jsonld context generator",
-      "generation_date": "2025-11-23T13:49:17",
+      "generation_date": "2025-11-24T16:42:40",
       "source": "dcat_ap_plus.yaml"
    },
    "@context": {

project/jsonld/dcat_ap_plus.jsonld

@@ -12,7 +12,7 @@
     "https://gitlab.com/opensourcelab/scientificdata/scidats/-/blob/feature/linkml-schemata/schemata/metadata_model_scidats_dcat_ap.yaml?ref_type=heads"
   ],
   "id": "https://w3id.org/nfdi-de/dcat-ap-plus/",
-  "version": "0.1.0rc1.post13.dev0+5c0f19e",
+  "version": "0.1.0rc1.post21.dev0+3faed58",
   "imports": [
     "linkml:types"
   ],
@@ -7795,9 +7795,9 @@
   ],
   "metamodel_version": "1.7.0",
   "source_file": "dcat_ap_plus.yaml",
-  "source_file_date": "2025-11-23T12:02:52",
-  "source_file_size": 88109,
-  "generation_date": "2025-11-23T13:49:17",
+  "source_file_date": "2025-11-24T16:42:12",
+  "source_file_size": 90872,
+  "generation_date": "2025-11-24T16:42:41",
   "@type": "SchemaDefinition",
   "@context": [
     "project\\jsonld/dcat_ap_plus.context.jsonld",

project/jsonschema/dcat_ap_plus.schema.json

@@ -3886,5 +3886,5 @@
     "metamodel_version": "1.7.0",
     "title": "dcat-ap-plus",
     "type": "object",
-    "version": "0.1.0rc1.post13.dev0+5c0f19e"
+    "version": "0.1.0rc1.post21.dev0+3faed58"
 }

src/dcat_ap_plus/datamodel/dcat_ap_plus.py

@@ -1,5 +1,5 @@
 # Auto generated from dcat_ap_plus.yaml by pythongen.py version: 0.0.1
-# Generation date: 2025-11-23T13:49:54
+# Generation date: 2025-11-24T16:42:41
 # Schema: dcat-ap-plus
 #
 # id: https://w3id.org/nfdi-de/dcat-ap-plus/
@@ -60,7 +60,7 @@
 from linkml_runtime.utils.metamodelcore import Decimal, URIorCURIE, XSDDate
 
 metamodel_version = "1.7.0"
-version = "0.1.0rc1.post13.dev0+5c0f19e"
+version = "0.1.0rc1.post21.dev0+3faed58"
 
 # Namespaces
 AFE = CurieNamespace('AFE', 'http://purl.allotrope.org/ontologies/equipment#AFE_')

src/dcat_ap_plus/datamodel/dcat_ap_plus_pydantic.py

@@ -27,7 +27,7 @@
 
 
 metamodel_version = "None"
-version = "0.1.0rc1.post13.dev0+5c0f19e"
+version = "0.1.0rc1.post21.dev0+3faed58"
 
 
 class ConfiguredBaseModel(BaseModel):

src/dcat_ap_plus/dcat_ap_shacl_2_linkml.py

@@ -120,7 +120,7 @@ def load_dcat_ap_shacl_shapes(jsonld_file='dcat_ap_shacl.jsonld'):
         - A Python object containing the loaded SHACL shapes
     TODO: Use Requests to download directly from the script, maybe with cache option.
     """
-    filepath = os.path.join('src', jsonld_file)
+    filepath = os.path.join('src', 'dcat_ap_plus', jsonld_file)
     with open(filepath, 'r') as file:
         print(f'INFO: Loaded the DCAT-AP SHACL shapes from {filepath}.')
         return json.load(file)
@@ -190,7 +190,7 @@ def parse_dcat_ap_shacl_shapes(builder):
                     # Check cardinality constraints of a slot
                     required = True if 'sh:minCount' in slot_shape and int(slot_shape['sh:minCount']) == 1 else False
                     multivalued = False if 'sh:maxCount' in slot_shape and int(slot_shape['sh:maxCount']) == 1 else True
-                    inlined_as_list = False if multivalued == False else True
+                    inlined_as_list = False if not multivalued else True
                     # Use default slot range 'string' as substitute for 'rdfs:Literal' and 'xsd:date' for
                     # https://semiceu.github.io/DCAT-AP/releases/3.0.0/#TemporalLiteral, except for
                     # https://semiceu.github.io/DCAT-AP/releases/3.0.0/#CataloguedResource, which uses linkml:Any.
@@ -384,12 +384,12 @@ def build_dcatap_linkml():
     """
     print('\n   --- Building the DCAT-AP LinkML representation ---')
 
-    builder = SchemaBuilder(name="dcat-ap")
-    builder.schema.id = 'https://nfdi-de.github.io/dcat-ap-plus/dcat_ap_linkml.yaml'
+    builder = SchemaBuilder(name="dcat-ap-linkml")
+    builder.schema.id = 'https://w3id.org/nfdi-de/dcat-ap-linkml'
     builder.schema.description = DESCRIPTION1 + '\nNOTE:' + NOTE
     builder.schema.default_prefix = 'dcatap_linkml'
     builder.schema.prefixes = PREFIX_MAP
-    builder.schema.prefixes['dcatap_linkml']='https://nfdi-de.github.io/dcat-ap-plus/dcat_ap_linkml.yaml#'
+    builder.schema.prefixes['dcatap_linkml']='https://w3id.org/nfdi-de/dcat-ap-linkml/'
     builder.schema.title = 'LinkML schema representation of DCAT-AP 3.0.0'
     builder.schema.license = 'CC-BY 4.0'
     builder.schema.default_range = 'string'
@@ -411,7 +411,7 @@ def build_dcatap_linkml():
 
 def build_dcatap_plus():
     """
-    Create a LinkML schema representation of DCAT-AP with additional classes, slots and contraints.
+    Create a LinkML schema representation of DCAT-AP with additional classes, slots and constraints.
     """
     print('\n  --- Building the extended DCAT-AP LinkML representation ---')
 
@@ -598,7 +598,7 @@ def extend_activity():
                                           in_subset='domain_agnostic_core'))
 
 
-    def extend_supportive_entites():
+    def extend_supportive_entities():
         for supportive_entity in builder.schema.classes.keys():
             slots = builder.schema.classes[supportive_entity].slots
             if supportive_entity not in (MAIN_NODES + DATATYPES + ["DataGeneratingActivity"]):
@@ -710,7 +710,7 @@ def add_subject_of_interest_context():
         builder.add_class(ClassDefinition(name='EvaluatedActivity',
                                           is_a='Activity',
                                           class_uri='prov:Activity',
-                                          description='An activity or proces that is being evaluated in a '
+                                          description='An activity or process that is being evaluated in a '
                                                       'DataGeneratingActivity.',
                                           slot_usage={
                                               'other_identifier':{
@@ -962,11 +962,11 @@ def add_analysis_context():
     # Initialize the extended DCAT-AP LinkML schema
 
     builder = SchemaBuilder(name="dcat-ap-plus")
-    builder.schema.id = 'https://nfdi-de.github.io/dcat-ap-plus/dcat_ap_plus.yaml'
+    builder.schema.id = 'https://w3id.org/nfdi-de/dcat-ap-plus'
     builder.schema.description = DESCRIPTION2
     builder.schema.default_prefix = 'dcatap_plus'
     builder.schema.prefixes = PREFIX_MAP
-    builder.schema.prefixes['dcatap_plus']='https://nfdi-de.github.io/dcat-ap-plus/dcat_ap_plus.yaml#'
+    builder.schema.prefixes['dcatap_plus']='https://w3id.org/nfdi-de/dcat-ap-plus/'
     builder.schema.prefixes['BFO']='http://purl.obolibrary.org/obo/BFO_'
     builder.schema.prefixes['OBI']='http://purl.obolibrary.org/obo/OBI_'
     builder.schema.prefixes['IAO'] = 'http://purl.obolibrary.org/obo/IAO_'
@@ -996,7 +996,7 @@ def add_analysis_context():
     # Add slots & constraints to DCAT-AP's Dataset class
     extend_dataset()
     extend_activity()
-    extend_supportive_entites()
+    extend_supportive_entities()
 
     # Add classes and properties needed to extend DCAT-AP
     add_classification_context()

src/dcat_ap_plus/schema/dcat_ap_linkml.yaml

@@ -1,4 +1,5 @@
-name: https://nfdi-de.github.io/dcat-ap-plus/dcat_ap_linkml.yaml
+id: https://w3id.org/nfdi-de/dcat-ap-linkml
+name: dcat-ap-linkml
 description: 'This LinkML schema representation of DCAT-AP 3.0.0 was automatically
   created from these [JSON-LD SHACL shapes](https://github.com/SEMICeu/DCAT-AP/blob/master/releases/3.0.0/shacl/dcat-ap-SHACL.jsonld)
   using this Python script: https://github.com/StroemPhi/dcat-4C-ap/tree/main/src/dcat-ap_shacl_2_linkml.py.
@@ -28,7 +29,6 @@ todos:
 - Check if https://github.com/linkml/linkml/issues/1813 is closed and range unions
   are validatable
 source: https://semiceu.github.io/DCAT-AP/releases/3.0.0
-id: https://nfdi-de.github.io/dcat-ap-plus/dcat_ap_linkml.yaml
 imports:
 - linkml:types
 license: CC-BY 4.0
@@ -56,7 +56,7 @@ prefixes:
   iana: https://www.iana.org/assignments/
   epos: https://www.epos-eu.org/epos-dcat-ap#
   schema: https://schema.org/
-  dcatap_linkml: https://nfdi-de.github.io/dcat-ap-plus/dcat_ap_linkml.yaml
+  dcatap_linkml: https://w3id.org/nfdi-de/dcat-ap-linkml/
 default_prefix: dcatap_linkml
 default_range: string
 types:

src/dcat_ap_plus/schema/dcat_ap_plus.yaml

@@ -1,6 +1,6 @@
 ---
 id: https://w3id.org/nfdi-de/dcat-ap-plus/
-version: "0.1.0rc1.post13.dev0+5c0f19e"  # Managed by dynamic-versioning. Don't change this line!
+version: "0.1.0rc1.post21.dev0+3faed58"  # Managed by dynamic-versioning. Don't change this line!
 name: dcat-ap-plus
 description: >-
   This metadata schema is an Extension of the DCAT Application Profile