wipo-gbd-transformation 1.1.52__py3-none-any.whl → 1.1.54__py3-none-any.whl

gbdtransformation/designs/woid/template.yml

@@ -21,7 +21,7 @@ designatedCountries:
 
 # can be deduced from appnum given office cc and (optional) appdate
 # note: we pass registration date when we don't have application or filing date, not rare with with Hague records
-st13: {{ ApplicationNumber | st13('WO', 0, appdate=appdate) }}
+st13: {{ ApplicationNumber | st13(HagueExpressTransaction.HagueCurrent.HagueRegistration.InternationalRegistrationNumber, 'WO', 0, appdate=appdate) }}
 
 applicationNumber: {{ ApplicationNumber }}
 
@@ -34,7 +34,16 @@ registrationNumber: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.In
 # some collections we can guess registration date
 # from event list
 registrationDate: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.InternationalRegistrationDate }}
-publicationDate: {{ HagueExpressTransaction.HagueHistory[0].PublicationDate }}
+
+{% if HagueExpressTransaction.HagueCurrent.HagueRegistration.PublicationDate %}
+publicationDates: 
+  - {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.PublicationDate }}
+earliestPublicationDate: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.PublicationDate }}
+{% else %}  
+publicationDates:
+  - {{ HagueExpressTransaction.HagueHistory[0].PublicationDate }}
+earliestPublicationDate: {{ HagueExpressTransaction.HagueHistory[0].PublicationDate }}
+{% endif %}
 
 # In Hague, default deferment period is 30 months after priority date or application date, 
 # but it can be lower for some Hague contracting parties, so deferment expiry date is a good 
@@ -99,6 +108,61 @@ applicants:
         entitlementDomiciled: {{ holder.Entitlement.EntitlementDomiciled.EntitlementDomiciledCode }}
   {% endcall %}
 
+applicantsNormalized:
+  {% call(holder) match('HolderNormalized', HagueExpressTransaction.HagueCurrent.HagueRegistration.HolderBag) %}
+    - identifier:
+
+      {% set ns = namespace(kind='organization') %}
+      {% call(name) match('Name', holder.Contact) %}
+        {% if name.PersonName %}
+          {% set ns.kind = 'person' %}
+        {% endif %}
+      {% endcall %}
+      kind: {{ ns.kind }}
+
+      {% call(name) match('Name', holder.Contact) %}
+      {% if name.PersonName %}
+      firstName:
+        - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.FirstName) }}
+          text: {{ name.PersonName.PersonStructuredName.FirstName }}
+      lastName:
+        - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.LastName) }}
+          text: {{ name.PersonName.PersonStructuredName.LastName }}
+      middleName:
+        - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.MiddleName) }}
+          text: {{ name.PersonName.PersonStructuredName.MiddleName }}
+      {% endif %}
+
+      {% if name.OrganizationName %}
+      orgName:
+        - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode }}
+          text: {{ name.OrganizationName.OrganizationStandardName }}
+      {% endif %}
+      {% endcall %}
+
+      fullAddress:
+      {% call(postalAddress) match('PostalAddress', holder.Contact.PostalAddressBag) %}
+        - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode }}
+          #text: {{ postalAddress.PostalStructuredAddress | format_complete_address }}
+          addressLine: {{ postalAddress.PostalStructuredAddress.AddressLineText }}
+          cityName: {{ postalAddress.PostalStructuredAddress.CityName }}
+          geographicRegionName: {{ postalAddress.PostalStructuredAddress.GeographicRegionName }}
+          postalCode: {{ postalAddress.PostalStructuredAddress.PostalCode }}
+          postalBox: {{ postalAddress.PostalStructuredAddress.PostalBox }}
+          countryCode: {{ postalAddress.PostalStructuredAddress.CountryCode }}
+      {% endcall %}
+
+      processingTool:
+        name: {{ holder.Contact._type }}
+        version: {{ holder.Contact._subtype }}
+        processingDate: {{ holder.Contact._when }}
+
+      entitlement:
+        entitlementNationalityCode: {{ holder.Entitlement.EntitlementNationalityCode }}
+        entitlementEstablishment: {{ holder.Entitlement.EntitlementEstablishment.EntitlementEstablishmentCode }}
+        entitlementDomiciled: {{ holder.Entitlement.EntitlementDomiciled.EntitlementDomiciledCode }}
+  {% endcall %}
+
 representatives:
   {% call(representative) match('Representative', HagueExpressTransaction.HagueCurrent.HagueRegistration.RepresentativeBag) %}
     - identifier:
@@ -136,6 +200,56 @@ representatives:
       {% endcall %}
   {% endcall %}
 
+representativesNormalized:
+  {% call(representative) match('RepresentativeNormalized', HagueExpressTransaction.HagueCurrent.HagueRegistration.RepresentativeBag) %}
+    - identifier:
+
+      {% set ns = namespace(kind='organization') %}
+      {% call(name) match('Name', representative.Contact) %}
+        {% if name.PersonName %}
+          {% set ns.kind = 'person' %}
+        {% endif %}
+      {% endcall %}
+      kind: {{ ns.kind }}
+
+      {% call(name) match('Name', representative.Contact) %}
+      {% if name.PersonName %}
+      firstName:
+        - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.FirstName) }}
+          text: {{ name.PersonName.PersonStructuredName.FirstName }}
+      lastName:
+        - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.LastName) }}
+          text: {{ name.PersonName.PersonStructuredName.LastName }}
+      middleName:
+        - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.MiddleName) }}
+          text: {{ name.PersonName.PersonStructuredName.MiddleName }}
+      {% endif %}
+
+      {% if name.OrganizationName %}
+      orgName:
+        - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode }}
+          text: {{ name.OrganizationName.OrganizationStandardName }}
+      {% endif %}
+      {% endcall %}
+
+      fullAddress:
+      {% call(postalAddress) match('PostalAddress', representative.Contact.PostalAddressBag) %}
+        - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode }}
+          #text: {{ postalAddress.PostalStructuredAddress | format_complete_address }}
+          addressLine: {{ postalAddress.PostalStructuredAddress.AddressLineText }}
+          cityName: {{ postalAddress.PostalStructuredAddress.CityName }}
+          geographicRegionName: {{ postalAddress.PostalStructuredAddress.GeographicRegionName }}
+          postalCode: {{ postalAddress.PostalStructuredAddress.PostalCode }}
+          postalBox: {{ postalAddress.PostalStructuredAddress.PostalBox }}
+          countryCode: {{ postalAddress.PostalStructuredAddress.CountryCode }}
+      {% endcall %}
+
+      processingTool:
+        name: {{ representative.Contact._type }}
+        version: {{ representative.Contact._subtype }}
+        processingDate: {{ representative.Contact._when }}
+  {% endcall %}
+
 designClaim:
 # updated for supporting Hague data
 {% if HagueExpressTransaction.HagueCurrent.HagueRegistration.DesignClaimBag.DesignClaim.DesignClaimTextBag %}
@@ -255,6 +369,56 @@ designs:
           {% endcall %}
       {% endcall %}
 
+    designerNormalized:
+      {% call(designer) match('DesignerNormalized', design.DesignerBag) %}
+      - identifier:
+
+        {% set ns = namespace(kind='organization') %}
+        {% call(name) match('Name', designer.Contact) %}
+          {% if name.PersonName %}
+            {% set ns.kind = 'person' %}
+          {% endif %}
+        {% endcall %}
+        kind: {{ ns.kind }}
+
+        {% call(name) match('Name', designer.Contact) %}
+        {% if name.PersonName %}
+        firstName:
+          - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.FirstName) }}
+            text: {{ name.PersonName.PersonStructuredName.FirstName }}
+        lastName:
+          - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.LastName) }}
+            text: {{ name.PersonName.PersonStructuredName.LastName }}
+        middleName:
+          - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.MiddleName) }}
+            text: {{ name.PersonName.PersonStructuredName.MiddleName }}
+        {% endif %}
+          
+        {% if name.OrganizationName %}
+        orgName:
+          - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode }}
+            text: {{ name.OrganizationName.OrganizationStandardName }}
+        {% endif %}
+        {% endcall %}
+
+        fullAddress:
+        {% call(postalAddress) match('PostalAddress', designer.Contact.PostalAddressBag) %}
+          - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode }}
+            #text: {{ postalAddress.PostalStructuredAddress | format_complete_address }}
+            addressLine: {{ postalAddress.PostalStructuredAddress.AddressLineText }}
+            cityName: {{ postalAddress.PostalStructuredAddress.CityName }}
+            geographicRegionName: {{ postalAddress.PostalStructuredAddress.GeographicRegionName }}
+            postalCode: {{ postalAddress.PostalStructuredAddress.PostalCode }}
+            postalBox: {{ postalAddress.PostalStructuredAddress.PostalBox }}
+            countryCode: {{ postalAddress.PostalStructuredAddress.CountryCode }}
+        {% endcall %}
+
+        processingTool:
+          name: {{ designer.Contact._type }}
+          version: {{ designer.Contact._subtype }}
+          processingDate: {{ designer.Contact._when }}
+      {% endcall %}
+    
     productIndicationClasses:
       kind: "Locarno"
       version: {{ design.LocarnoClassificationBag.LocarnoClassificationEdition }}
@@ -339,4 +503,14 @@ extra:
         {% endcall %}
         
     {% endcall %}
-    
+    
+  history:
+    {% call(history) match('HagueHistory', HagueExpressTransaction) %}
+
+      - sequenceNumber: {{ history._sequenceNumber }}
+        hagueBulletinNumber: {{ history.HagueBulletinNumber }}
+        publicationDate: {{ history.PublicationDate }}
+        eventType: {{ history | get_event_type() }}
+        content: {{ history | serialize() }}
+
+    {% endcall %}

gbdtransformation/designs/xxid/template.yml

@@ -12,7 +12,7 @@ designatedCountries:
 
 # some collections indicate that the application
 # originates from international filing and provide IR number
-referece:
+reference:
   application:
     - number:
       date:
@@ -25,8 +25,8 @@ referece:
 # rarely passed
 filingPlace:
 
-# can be deduced from appnum given office cc and (optional) appdate
-st13: # {{ Design.ApplicationNumber | st13('XX', appdate=... }}
+# can be deduced from appnum given office cc and (optional) appdate, if no application number, fallback to registration number
+st13: # {{ Design.ApplicationNumber | st13(registrationNumber, 'XX', appdate=... }}
 
 applicationNumber:
 # dates can be converted if not matching expected format
@@ -38,7 +38,14 @@ registrationNumber:
 # some collections we can guess registration date
 # from event list
 registrationDate:
-publicationDate:
+
+# this is a list
+publicationDates:
+  - str (date)
+
+# for novelty search
+earliestPublicationDate:
+
 effectiveDate:
 defermentExpiryDate:
 expiryDate:
@@ -47,7 +54,6 @@ applicationLanguageCode:
 # rarely passed
 secondLanguageCode:
 
-
 applicants:
   - identifier:
     kind:
@@ -71,6 +77,39 @@ applicants:
         countryCode:
         postalCode:
     countryCode: # sometimes, country name is provided instead
+    entitlement:
+        entitlementNationalityCode: 
+        entitlementEstablishment: 
+        entitlementDomiciled:
+
+applicantsNormalized:
+  - identifier:
+    kind:
+    orgName:
+      - languageCode:
+        text:
+    firstName:
+      - languageCode:
+        text:
+    lastName:
+      - languageCode:
+        text:
+    middleName:
+      - languageCode:
+        text:
+    fullAddress:
+      - languageCode:
+        addressLine:
+        cityName:
+        geographicRegionName:
+        countryCode:
+        country:
+        postalCode:
+        postalBox: 
+    processingTool:
+      name:
+      version:
+      processingDate:
 
 representatives:
   - identifier:
@@ -96,6 +135,34 @@ representatives:
         postalCode:
     countryCode: # sometimes, country name is provided instead
 
+representativesNormalized:
+  - identifier:
+    kind:
+    orgName:
+      - languageCode:
+        text:
+    firstName:
+      - languageCode:
+        text:
+    lastName:
+      - languageCode:
+        text:
+    middleName:
+      - languageCode:
+        text:
+    fullAddress:
+      - languageCode:
+        addressLine:
+        cityName:
+        geographicRegionName:
+        countryCode:
+        country:
+        postalCode:
+        postalBox:
+    processingTool:
+      name:
+      version:
+      processingDate:
 
 correspondence:
   fullName:
@@ -119,6 +186,33 @@ correspondence:
       postalCode:
   countryCode: # sometimes, country name is provided instead
 
+correspondenceNormalized:
+  kind:
+  orgName:
+    - languageCode:
+      text:
+  firstName:
+    - languageCode:
+      text:
+  lastName:
+    - languageCode:
+      text:
+  middleName:
+    - languageCode:
+      text:
+  fullAddress:
+    - languageCode:
+      addressLine:
+      cityName:
+      geographicRegionName:
+      countryCode:
+      country:
+      postalCode:
+      postalBox:
+  processingTool:
+    name:
+    version:
+    processingDate:
 
 designClaim:
   claims:
@@ -186,12 +280,40 @@ designs:
             postalCode:
         countryCode: # sometimes, country name is provided instead
 
+    designerNormalized:
+      - identifier:
+        kind:
+        orgName:
+          - languageCode:
+            text:
+        firstName:
+          - languageCode:
+            text:
+        lastName:
+          - languageCode:
+            text:
+        middleName:
+          - languageCode:
+            text:
+        fullAddress:
+          - languageCode:
+            addressLine:
+            cityName:
+            geographicRegionName:
+            countryCode:
+            country:
+            postalCode:
+            postalBox:
+        processingTool:
+          name:
+          version:
+          processingDate:
+
     productIndicationClasses:
       - kind: Locarno/US/CA/Etc
         version:  #mostly
         classes:
         - code:
-          description:
 
     exhibition:
       - date:

gbdtransformation/execs.py

@@ -627,9 +627,10 @@ def run():
     import json
     for rest in results:
         st13 = json.loads(rest['out'])['st13']
-        appnumber = json.loads(rest['out'])['applicationNumber']
+        appnumber = json.loads(rest['out']).get('applicationNumber')
+        registration_number = json.loads(rest['out']).get('registrationNumber')
         if st13 in st13s:
-            print(st13, appnumber, l2[l1.index(st13)])
+            print(st13, appnumber, registration_number, l2[l1.index(st13)])
         else:
             l1.append(st13)
             l2.append(appnumber)

{wipo_gbd_transformation-1.1.52.dist-info → wipo_gbd_transformation-1.1.54.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wipo-gbd-transformation
-Version: 1.1.52
+Version: 1.1.54
 Summary: GBD XML ETL package
 Home-page: https://github.com/GBD-Wipo/xmlE
 Author: WIPO GDB team
@@ -9,12 +9,12 @@ Keywords: gbdtransformation
 Classifier: Programming Language :: Python :: 3.6
 License-File: LICENSE.md
 Requires-Dist: boto3
-Requires-Dist: jinja2 (==2.11.2)
+Requires-Dist: jinja2 ==2.11.2
 Requires-Dist: xmltodict
 Requires-Dist: dicttoxml
 Requires-Dist: PyYAML
 Requires-Dist: munch
 Requires-Dist: tabulate
-Requires-Dist: markupsafe (==2.0.1)
+Requires-Dist: markupsafe ==2.0.1
 
 GBD XML ETL package

{wipo_gbd_transformation-1.1.52.dist-info → wipo_gbd_transformation-1.1.54.dist-info}/RECORD

@@ -1,6 +1,6 @@
 gbdtransformation/.DS_Store,sha256=0P5iuLZ7zgY5l38MNfo5m8w3yfR_rIdKFFFjvnF0ws4,6148
 gbdtransformation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gbdtransformation/execs.py,sha256=qmu6SqeLIeDqS6_XlAD1kdzNSTekchoqhLzbXoxf_B4,25015
+gbdtransformation/execs.py,sha256=H1TxxWGWzZsEUfqgp0Pg7olmWeFMKDonTRyxEc2Lgb8,25120
 gbdtransformation/parser.py,sha256=m6b1J0kJEaEDc0I8HKxzzN2nsQWKFfLlQqS3nT02kb4,7074
 gbdtransformation/renders.py,sha256=RmvQgugnG2ErvDxP4I9yovW67gEZNpOd59nrzEYfQPI,4555
 gbdtransformation/brands/__init__.py,sha256=abDdinNkilR-qYg4dhVxP_e1-ZixCzVuHGxbFt710TE,1605
@@ -64,9 +64,9 @@ gbdtransformation/brands/bztm/schema,sha256=AP0MxQyD0hY4APRh8nxitlxMqJYJB4AaaTJ8
 gbdtransformation/brands/bztm/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/brands/bztm/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gbdtransformation/brands/catm/__init__.py,sha256=pMtR-N5slJD0QHJU36_dbeWyqoqn4Q0eaMOmfO4Ed_o,270
-gbdtransformation/brands/catm/filters.py,sha256=_bjcSr1EccujS-zJnUAIqtacOxDTmY4PfCrYuQqIeio,8204
+gbdtransformation/brands/catm/filters.py,sha256=iZOJFFpmXySl08VWkLDF3cMqFxW3ZGclTIXfG20HW-A,8216
 gbdtransformation/brands/catm/schema,sha256=Xace88lwiEefhHkk6Zg12dzVF237nMy06HMISEXaTwk,34762
-gbdtransformation/brands/catm/template.yml,sha256=Qp3-S_WsdnjTnjRPCpxC4cOB70xwek9bbQm0Nox5izc,9738
+gbdtransformation/brands/catm/template.yml,sha256=AwAv3VPRY2VmoyTyPZCwKdRJSmYdVUTRpJj4Zv3uqrM,9861
 gbdtransformation/brands/chtm/__init__.py,sha256=HPYmDCQ41vkuoXSA94CRtqN_pEKDaUhbpXLOBqlaumQ,130
 gbdtransformation/brands/chtm/filters.py,sha256=920M3dD2ag6RmotTQJwrGaxnsuI5VvTwsdZsYwDxcVI,5174
 gbdtransformation/brands/chtm/schema,sha256=PWp5xUNXHbOt3U2zQKelVOKIbH0OYqNmwzkcB3QucuE,1385
@@ -170,7 +170,7 @@ gbdtransformation/brands/ipas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 gbdtransformation/brands/ipas/filters.py,sha256=cjHa9yciQfUWC2XehqcluwLODbajU8yZvleATpKI6-4,6561
 gbdtransformation/brands/ipas/template.yml,sha256=TMD1OLKdxGN9XLc6gjTIArM0bXjT0hwQbam4PTvxAzE,7402
 gbdtransformation/brands/istm/__init__.py,sha256=Odl0eAIHwvFrNHxJCqM-9Yht1kcLcXJSZDpJbSLXeq0,192
-gbdtransformation/brands/istm/filters.py,sha256=6FijaxD9sYtuCT9tQjHQAO51BWl38z6X3Jt3xSyVuQU,2903
+gbdtransformation/brands/istm/filters.py,sha256=KlqBtHmwxU8e4Y58elGqEMnzNf97ceqTS-FpyB1WgA0,2833
 gbdtransformation/brands/istm/schema,sha256=iMcsysU2fLG9lQYr3rwsbt3U0oC8xrIrB0-XitQGsMg,789
 gbdtransformation/brands/istm/template.yml,sha256=Eo7aW87OOyLeHpR7TwEejapKYFFevMfW7S26yH2IaL0,3660
 gbdtransformation/brands/ittm/__init__.py,sha256=x7MEG0cRT7jOj2U9I4stffawL5ZOFcH3iywiNSsdXEQ,132
@@ -399,8 +399,13 @@ gbdtransformation/brands/uytm/__init__.py,sha256=UHmbQDIPDdApISBKfO9tKOX6LgUQ_Ib
 gbdtransformation/brands/uytm/filters.py,sha256=i7SBMVTF70OERVdsS3Dfv19S3-9kyxE-y4aYA59YxA4,1976
 gbdtransformation/brands/uytm/schema,sha256=uMd1E_XRVQ_wHVrGq5fqFH6Fyg8cWx2DTQbVvH8tmmA,3730
 gbdtransformation/brands/uytm/template.yml,sha256=fLZVKwC0j6fAxv-kpngeSnGOZMiK-T_wWdxFmd4L7pc,5497
+gbdtransformation/brands/vctm/__init__.py,sha256=EHssGg8NHP_ywIgUYk2fxpNtalIlSdpzuCOhUfbJuA8,86
+gbdtransformation/brands/vctm/filters.py,sha256=sjw2IhCg0CYh0zeci5dL7VY8A2us8dHpigIi6JNCTYY,2138
+gbdtransformation/brands/vctm/schema,sha256=AP0MxQyD0hY4APRh8nxitlxMqJYJB4AaaTJ8y20-XBA,3283
+gbdtransformation/brands/vctm/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
+gbdtransformation/brands/vctm/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gbdtransformation/brands/vntm/__init__.py,sha256=po50MWZ7H_x6jhT_C83-HvsjAE0J8IQpubzvXwTqmgI,225
-gbdtransformation/brands/vntm/filters.py,sha256=JgOjG03WnRD_N5tL5jP5mP-YGJozRECyypsm3TvlCJo,2530
+gbdtransformation/brands/vntm/filters.py,sha256=R6qF0UGIHL3njBEXH5P_GI9I8Fyg1__HhTAvRwu92rw,2441
 gbdtransformation/brands/vntm/schema,sha256=TFrF4FR76cytcbtQkDWxtF74I0tCPRDIvWRFeqaJt6Q,3242
 gbdtransformation/brands/vntm/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/brands/vntm/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -467,90 +472,94 @@ gbdtransformation/commons/emrp/__init__.py,sha256=LPq1qlU4nPGFyKPsgKWZG9K2mV4vWR
 gbdtransformation/commons/emrp/filters.py,sha256=CA7FRKxuhP1QVlB7hh6uIf7EVBXr1MkJ_NKAaP7nqBo,68
 gbdtransformation/commons/emrp/template.yml,sha256=Zor0npqNLZfY9oFs7Ts-bwbsLlUJGmZMHi1cb35MQmI,1402
 gbdtransformation/designs/__init__.py,sha256=0zM_Nw5d8cwxBsFq0NMxBRb21DiOUqgCb020CGJN_KY,242
-gbdtransformation/designs/filters.py,sha256=TaXReOAUmull4SpwHR-OmUMex7OyVj1pc7EEv7KzDf8,2045
+gbdtransformation/designs/filters.py,sha256=cFXAVGynjZjd5IX1CisEAfVhNLCMIZiu3xz1RUsX3zw,2584
 gbdtransformation/designs/alid/__init__.py,sha256=U1i1Qng034s7l_2No1yJKbHvUSnMWl66ZLSinKMMS7Y,95
-gbdtransformation/designs/alid/filters.py,sha256=qWMvr2maPSrIpL9GwfcvgCRTNqq_9TuAEygEAyJDapg,1564
+gbdtransformation/designs/alid/filters.py,sha256=bwE0eg3BCaoUlWT_U1BSvBIbKz1a2n0JTENJW-ZfD5s,1947
 gbdtransformation/designs/alid/schema,sha256=4W6aAkQ4JFTzOEVGYRWlWpsieoIIWoVqhLLnGzI3MjM,3502
 gbdtransformation/designs/alid/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
+gbdtransformation/designs/bgid/__init__.py,sha256=jLrJQ5nccnWItNDV4kmUdq-uo6ms500KnR9qchLry8Q,84
+gbdtransformation/designs/bgid/filters.py,sha256=wDLEZ8GAtVl4UBVwtW59siB44tiSmJOCMDS-aKUEd7s,2897
+gbdtransformation/designs/bgid/schema,sha256=WOLoyQZCQ_PYjsXODbJSE3vEPppqwm85K7thf5T7lKQ,3667
+gbdtransformation/designs/bgid/template.yml,sha256=dAnTluo-554scf_FxYalZ7xHj8RfGfBIhFZurXAenZY,5860
 gbdtransformation/designs/bnid/__init__.py,sha256=Y_X59eGmIFOkwWF4SkaxTQ3z7QAfIHGoL1VHM8ywbHo,87
-gbdtransformation/designs/bnid/filters.py,sha256=nvRiHLJIH5IIGc0XQ94f7bAEgnrBT_VMgslRN1wMUvM,1261
+gbdtransformation/designs/bnid/filters.py,sha256=vx4rZhlOIYzpYfMvm8baxuKfQZWml8dW58oN_I_NT6M,1644
 gbdtransformation/designs/bnid/schema,sha256=BSzYzhQUcv3cLI-rDSLEEcIAOxMSIgQClvfKDVVTyak,3145
 gbdtransformation/designs/bnid/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/designs/bwid/__init__.py,sha256=pzix_Sy_6D6uWvMeWsirR9n3jTWzrl5BjxD40JNRheQ,140
-gbdtransformation/designs/bwid/filters.py,sha256=ZWm2vLEHsKo1OMoTFIBDxLQV0C4r6s29Md9A2xJXx88,1380
+gbdtransformation/designs/bwid/filters.py,sha256=sLDmJwIKas7UsshOnKqJw3v-6dV6GB0WQahWp3udEMk,1763
 gbdtransformation/designs/bwid/schema,sha256=1r9dWYV65h_PoGOkhC9NcCM0n-co-_s3tipPbkA0_GU,4042
 gbdtransformation/designs/bwid/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/designs/crid/__init__.py,sha256=8EoYA1bg1glF-0Gsfnwy4EInbekNZLa_FFMYZXFW_VQ,88
-gbdtransformation/designs/crid/filters.py,sha256=rHrgbIRJ53rDyLfukVt9qW8suMB1z2-MSM07CmjRzUo,1323
+gbdtransformation/designs/crid/filters.py,sha256=32KRvV_mWQGFd4asa069FoZ-thn1pSkpeClkq8RfX00,1707
 gbdtransformation/designs/crid/schema,sha256=MsviyYOn0iDtlxZEPr-u4jfqBdkPb03OJNxDspjlz-I,3696
 gbdtransformation/designs/crid/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/designs/cuid/__init__.py,sha256=uc087GF8rJ3uwm5VRxZ1mqxxhz0MNQQWgjzKilsu080,93
-gbdtransformation/designs/cuid/filters.py,sha256=TVtMOTySvXM6MBgplaCpd8RRHeHyQF7i1ie5zO2whEI,1105
+gbdtransformation/designs/cuid/filters.py,sha256=bo2qJ6ttq_qFzkedjsDMN5Mc0Cw_gOko7a8RD9H2z6k,1489
 gbdtransformation/designs/cuid/schema,sha256=JZ_ZYSgaFIKAkT8DBc_jlUkCzrS5dNWU9GBTBsPA9-8,3857
 gbdtransformation/designs/cuid/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/designs/egid/__init__.py,sha256=7mgvG_Z35b9eE-1bOsv_0adbFhtjMA3oo7_RhUTVt-4,87
-gbdtransformation/designs/egid/filters.py,sha256=_CVi6apzfXVRnOLx97cvM7-U23GLPcACQOgq-vyQTNU,1251
+gbdtransformation/designs/egid/filters.py,sha256=mhaTzZbNjcDeRLQLiTGL3kJFJkPcu-fft_NdVPm2UIE,1635
 gbdtransformation/designs/egid/schema,sha256=wYLahygD8w60xS0Cjiu7To2GmB1spODG3dx0GFawNr0,3202
 gbdtransformation/designs/egid/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/designs/idid/__init__.py,sha256=VkDcskZjJF6RN5GGF7CebAwffmoHA7bQyUFhwbgvHZ0,98
-gbdtransformation/designs/idid/filters.py,sha256=GarV3tEq7WO0pRqgVCeBklGMJucC5B65zFyBOZC0Ad4,1413
+gbdtransformation/designs/idid/filters.py,sha256=Yr9uv_fnfnurUPILKV6aK5pW6NwrsHBtPR7Lv_hS8pk,1797
 gbdtransformation/designs/idid/schema,sha256=wNCAOWV0H7CPQ1tnrZ4ClX5SnwgyGv3gBAiKz2h2Ijw,4092
 gbdtransformation/designs/idid/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/designs/ipas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gbdtransformation/designs/ipas/filters.py,sha256=LvadfTTBkeDV91lJU7mEwNIvGXB95QX2M9vC5fBssO0,3560
-gbdtransformation/designs/ipas/template.yml,sha256=WnYIqrQ7qCdWRAiW8Agzcep-r7UI6n5gi1_dQaOeYUM,7973
+gbdtransformation/designs/ipas/filters.py,sha256=VnvR4Bj-W7ZlA9tBZLWlt-Lw7Vk53qCZwo5FmN1F01M,6711
+gbdtransformation/designs/ipas/template.yml,sha256=86XUmvJr6598TWQ8T-nLCKY-V6MOxfbwCPHIfcrzrSs,8108
 gbdtransformation/designs/joid/__init__.py,sha256=n3o4q-5ZgLxMOaw_ILCd-oXyQlRegHD29V308bWdhG4,129
-gbdtransformation/designs/joid/filters.py,sha256=KsGU6h0MAk8aDzEdCzOIiTRzbYqIp32Sbj62jzgFYo0,1265
+gbdtransformation/designs/joid/filters.py,sha256=cXpeljaZMDYdRoz3B7IAN-F4RleOFa5ZcuROmlmXQCs,1649
 gbdtransformation/designs/joid/schema,sha256=F2yRVbByiFoLfftr5-N8CU38-cMSeYE5yQPm3_fYw-A,3830
 gbdtransformation/designs/joid/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/designs/keid/__init__.py,sha256=3VPO0He0ST4Np7iu-GbganBs5nLpfAeEMS85mP0ZZQc,124
-gbdtransformation/designs/keid/filters.py,sha256=jGuhcLhR83qIlFmq5x5JMgog6FFKy1jIczV6hcDiSdw,1274
+gbdtransformation/designs/keid/filters.py,sha256=6B7iiR7d2dRnynK3gBkxi2Mzrz0izmWNR3NhSHwOoPQ,1658
 gbdtransformation/designs/keid/schema,sha256=PXmZWv6H9lE2Dyh6wd_ZfZdd73umFioDRkBX-u5n_i8,3914
 gbdtransformation/designs/keid/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/designs/khid/__init__.py,sha256=s1v2N-zkWufdXw6D644D_vnJL1vAsFZ9TSBZNCmvUnU,87
-gbdtransformation/designs/khid/filters.py,sha256=tZjHfZtVK56-1TpU0fWys-WX7OaE2HXTRzt-983UwTg,1262
+gbdtransformation/designs/khid/filters.py,sha256=kJ5-blSb1QRU8D032BgaTyQ9Jgq65_gsyElRUwQnXcQ,1646
 gbdtransformation/designs/khid/schema,sha256=UADl14SH_-sRCY7D8Enf6FeH2al_1kTLWCVneCRtDJI,3968
 gbdtransformation/designs/khid/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/designs/laid/__init__.py,sha256=YM1Q1PEfEWCnqpX7UQMmwGGs4VVoly176mTcTIZtNKE,81
-gbdtransformation/designs/laid/filters.py,sha256=oN0S0ar0GDE838VxtVUUj9tcd27o2jl_ZDCl_AuTMVw,1248
+gbdtransformation/designs/laid/filters.py,sha256=AvcSiq7LPPF6M3dRg2XxU0D6D7QbYnTLK8KJM5NYfGk,1631
 gbdtransformation/designs/laid/schema,sha256=jkMwyOhGR1tGpFL6Ovi55wpSpbHylu3UnGpLO-ynt_o,3684
 gbdtransformation/designs/laid/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/designs/mnid/__init__.py,sha256=iEM2BvQvr2FzismA4mcZu2thpz6Ak5PcFO81vxdxk68,125
-gbdtransformation/designs/mnid/filters.py,sha256=fuQ_H96XKlOvmGSX1B-Y-9q0Orv82hvmfoliqDoE2Pw,1261
+gbdtransformation/designs/mnid/filters.py,sha256=vZN5eWpoWdNLfTignhJYF7QFXdFbTpG73u_NrIpfXKs,1645
 gbdtransformation/designs/mnid/schema,sha256=cL6vjXJsQNmJ-acerybZAQ2SP5xBR9FksDXRcwgJ8b8,3858
 gbdtransformation/designs/mnid/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/designs/myid/__init__.py,sha256=r7ki64LZqptIipzExxfEa-UFp_FsB3zyUi8UnmKydYo,122
-gbdtransformation/designs/myid/filters.py,sha256=bIeQ25E3ezM2wGRD1aqU7lyB4IGoiaJQqsJKux1o3DI,1197
+gbdtransformation/designs/myid/filters.py,sha256=xSbAg6ShiR1GGra5C_9_t0QcBftUGQ1al1rITv5Opjs,1580
 gbdtransformation/designs/myid/schema,sha256=3SYG1Pu6xMhTmasJYFgJlKr1Im8UUZKX9EjUHKUfY80,3785
 gbdtransformation/designs/myid/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/designs/phid/__init__.py,sha256=c2hjuzYjA2-okkbnfOTA4vCphr8CJX-aYFRWg_zwAJg,134
-gbdtransformation/designs/phid/filters.py,sha256=A9Vjzy-m8IzsB7qQJhaSo9qYg9xOFbPxp-Lgde1MSXU,1538
+gbdtransformation/designs/phid/filters.py,sha256=EZoG-h7ZV6k8P_PSkEEReYZRWCIJrRW6FIrBIZwEmW0,1921
 gbdtransformation/designs/phid/schema,sha256=UxP-sj3ONGQqW-2qSsLAVXpQU8ymPHZFm0AENKhrhOM,3754
 gbdtransformation/designs/phid/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/designs/sgid/__init__.py,sha256=_KSJwFiKqhUT1aLXgaPgr6fojPLqfmvPdkh_xpihPds,128
-gbdtransformation/designs/sgid/filters.py,sha256=Ti9dSas-3bzsjGA4kWaT8WCcs7kV7EIhO_mWLFfUhbs,1381
+gbdtransformation/designs/sgid/filters.py,sha256=8Wb9AKU6W9GLODH4D2gUxjGaTVlEoH3Z2aet57NCHXE,1765
 gbdtransformation/designs/sgid/schema,sha256=0bNKAL6VKaiRu3TK3SZ9V-t6vqoN86pkiU3PfE2kr40,4501
 gbdtransformation/designs/sgid/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/designs/thid/__init__.py,sha256=hXLZOUHc4HHuGC-WOMKZDCJlgrHL6-EYjdyLW2GWDME,56
-gbdtransformation/designs/thid/filters.py,sha256=eV-vhHLzrc0ymLrsi3s8e69xcOxWuzOi0YkPFWy2FWc,1361
+gbdtransformation/designs/thid/filters.py,sha256=txW_UeiUfKmFrIp9_Zxpf0Y3nMOL5gcj3aXhBBk4mis,1744
 gbdtransformation/designs/thid/schema,sha256=nNz7rstNxaulw6nMr-65w7yVF0tgkDYob08gtB1i3WE,3912
 gbdtransformation/designs/thid/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/designs/tnid/__init__.py,sha256=um-XfQWW58iiIqrWdXTMbY1UQ9tG7h9e5kTehhb9vvc,93
-gbdtransformation/designs/tnid/filters.py,sha256=F8VijVNIt9ZoX4nqZvtC21FRmU8UK7dUelAYwrW1e9U,1425
+gbdtransformation/designs/tnid/filters.py,sha256=3pc0--Cnx9pIkUaAhkA7sdfP8I407V02e2lXPFgxJxg,1808
 gbdtransformation/designs/tnid/schema,sha256=kkDxno6zbBk6qqxZs8JE9Y6lcpn9JJ8qE5885PhI7GE,3829
 gbdtransformation/designs/tnid/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/designs/vnid/__init__.py,sha256=JaV6-HeRUl11JwL9V7_uc8gBmSRj0pnKyAXftATfS4c,86
-gbdtransformation/designs/vnid/filters.py,sha256=P_wDBcRMjhWQOJERO3Wpe1xBm1VIm0EYX-_2IwwNKBk,1318
+gbdtransformation/designs/vnid/filters.py,sha256=HlZJp1Zb1zU37tZO-xBe0Kt-TlCT0nlBS4QbpK6Nq7Y,1701
 gbdtransformation/designs/vnid/schema,sha256=HxkKmaih8mUTYZst9aIbEgv_uXhqS6PQp3C4S7utz18,3830
 gbdtransformation/designs/vnid/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/designs/woid/__init__.py,sha256=Cdy9Ki01mAvufymKb9QSLwfFggaoerOenq6BxhPu500,66
-gbdtransformation/designs/woid/filters.py,sha256=tJmoNgWcIYtoFPh3BVqWP_MI-AHDRs8S2KxqACiJiOo,16320
+gbdtransformation/designs/woid/filters.py,sha256=0TAuOxP9Gj4Vds7zgRZ8X-lu9dndXDDTjnktbrI14Pg,16986
 gbdtransformation/designs/woid/schema,sha256=DoJKgqrbOIPrrSJ7WcJM6aQpDqG34yD0MT7bsxauNpM,19967
-gbdtransformation/designs/woid/template.yml,sha256=G3rCnVCJuE7f3sI_du42fXHcGfh_xmmQhrw-aTYDFEs,18830
+gbdtransformation/designs/woid/template.yml,sha256=td3Y7vfssL569Anr4Sz1y11ejOZmbRbC_-xw2ON7Vk4,27778
 gbdtransformation/designs/xxid/__init__.py,sha256=Cdy9Ki01mAvufymKb9QSLwfFggaoerOenq6BxhPu500,66
 gbdtransformation/designs/xxid/filters.py,sha256=YCaQ6yH2LINwCQvbPHDhnORQyWglbswLlSOY6ur3KXQ,1874
 gbdtransformation/designs/xxid/schema,sha256=KaFhfG6P5SE787wkAuME6hhpcg7vLnSb9x1rW_0EL3M,163
-gbdtransformation/designs/xxid/template.yml,sha256=Ul2NV4MVYS9Zz3axBVcR8VLzXYBowfPCp4rbnAqn3lA,4607
+gbdtransformation/designs/xxid/template.yml,sha256=m1V4DZqfFwGuMNDLDlCsiw_YjBVlGruga6AzVvzH6HA,6934
 gbdtransformation/utilities/ISOCountryCodeType-V2006.xsd,sha256=T-QCdih6hFG7Tj_YlL7R0OyEmdAh1_NUDK_sMhVy4CI,41465
 gbdtransformation/utilities/ISOCurrencyCodeType-V2001.xsd,sha256=FC0I3EPmeLfXeRGV25i7t5G8KXLHnX5m-pKHOYWNmSw,28868
 gbdtransformation/utilities/ISOLanguageCodeType-V2002.xsd,sha256=ouRSwAnkVtjGLwZ50LXOW3V21lIWVlPw3yr9CcsVPRU,22147
@@ -563,9 +572,10 @@ gbdtransformation/utilities/st66.xsd,sha256=co8aFN3a5TpudllRttWmfLeiZu8ulNipfeXm
 schemas/ShazamConfig.py,sha256=D67os5B11C41h_WZ7kk54Ss0Kk7tHh8W0d_1c_aX-lY,1191
 schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 schemas/schema_extractor.py,sha256=3-ImtnI777f6b3VA0A_w-NoXdlGz5VZMzK6MnPdQQAY,10294
-wipo_gbd_transformation-1.1.52.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
-wipo_gbd_transformation-1.1.52.dist-info/METADATA,sha256=ef8IBR_mV57Sd6yP10lPDzyMghx5XYoV-3ZGs_Bp8nM,521
-wipo_gbd_transformation-1.1.52.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-wipo_gbd_transformation-1.1.52.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
-wipo_gbd_transformation-1.1.52.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
-wipo_gbd_transformation-1.1.52.dist-info/RECORD,,
+wipo_gbd_transformation-1.1.54.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
+wipo_gbd_transformation-1.1.54.dist-info/METADATA,sha256=PDsvsGpyapstphx6eWJ2Z32J2_SxtfRMe_IM0ClRg1U,517
+wipo_gbd_transformation-1.1.54.dist-info/SOURCES_Stefans-Mac-Studio.local_Sep-18-063455-2024_Conflict.txt,sha256=NeGxpq7lHSg1kaKoQE1hRDhEL5c39TAp008ptbN08NU,29740
+wipo_gbd_transformation-1.1.54.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+wipo_gbd_transformation-1.1.54.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
+wipo_gbd_transformation-1.1.54.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
+wipo_gbd_transformation-1.1.54.dist-info/RECORD,,