wipo-gbd-transformation 1.1.79__py3-none-any.whl → 1.1.81__py3-none-any.whl

gbdtransformation/brands/hrtm/filters.py

@@ -137,3 +137,22 @@ def clean_app_reg_number(app_num):
     if not app_num[:1].isdigit():
         app_num = app_num[1:]
     return app_num
+
+def get_publication_date(publications):
+    # in the publication information, in case:
+    # PublicationSection == "Registration"
+    # the associated PublicationDate is the publicationDate
+    if publications == None:
+        return None
+    if isinstance(publications, list):
+        for publication in publications:
+            if 'PublicationSection' in publication and publication['PublicationSection'] == 'Registration':
+                if 'PublicationDate' in publication:
+                    return publication['PublicationDate']
+    else:
+        if "Publication" in publications:
+            publication = publications["Publication"]
+            if 'PublicationSection' in publication and publication['PublicationSection'] == 'Registration':
+                if 'PublicationDate' in publication:
+                    return publication['PublicationDate']
+    return None

gbdtransformation/brands/hrtm/template.yml

@@ -21,6 +21,8 @@ applicationLanguageCode: {{ TradeMark.ApplicationLanguageCode }}
 officeStatus: {{ TradeMark.MarkCurrentStatusCode }}
 statusDate: {{ TradeMark.MarkCurrentStatusDate | convertdate('%Y-%m-%d') }}
 
+publicationDate: {{ TradeMark.PublicationDetails | get_publication_date | convertdate('%Y-%m-%d')}}
+
 expiryDate: {{ TradeMark.ExpiryDate | convertdate('%Y-%m-%d') }}
 
 markDisclaimerDetails:

gbdtransformation/brands/notm/filters.py

@@ -63,10 +63,14 @@ def translate_feature(feature):
     #raise Exception('Feature "%s" unmapped' % feature)
 
 def get_local_text(node):
+    if node is None:
+        return None
     if "$" in node:
         return node["$"]
 
 def get_local_texts(nodes):
+    if nodes is None:
+        return None
     text = ""
     start = True
     for node in nodes:

gbdtransformation/brands/notm/template.yml

@@ -138,7 +138,7 @@ publications:
 
 representatives:
   {% call(representative) match('representative', trademark.representativeBag) %}
-  - identifier: {{ representative.partyIdentifier }}
+  - identifier: {{ representative.partyIdentifier  | get_local_text() }}
     kind:
     fullName:
       - languageCode:
@@ -173,7 +173,7 @@ correspondence:
 
 applicants:
   {% call(applicant) match('applicant', trademark.applicantBag) %}
-  - identifier: {{ applicant.partyIdentifier }}
+  - identifier: {{ applicant.partyIdentifier  | get_local_text() }}
     kind:
     fullName:
       - languageCode:
@@ -197,6 +197,32 @@ applicants:
     {% endcall %}  
   {% endcall %}
 
+holders:
+  {% call(holder) match('holder', holderBag) %}
+  - identifier: {{ holder.partyIdentifier | get_local_text() }}
+    kind:
+    fullName:
+      - languageCode:
+        text: {{ holder.contact.contactTypeChoiceSequence.name.entityName.transliterationName | get_local_texts() }}
+    fullAddress:
+      {% call(postalAddress) match('postalAddress', holder.contact.contactTypeChoiceSequence.postalAddressBag) %}
+      - languageCode: 
+        text: {{ postalAddress.postalStructuredAddress | get_full_address() }}
+      {% endcall %}
+    detailedAddress:
+      {% call(postalAddress) match('postalAddress', holder.contact.contactTypeChoiceSequence.postalAddressBag) %}
+      - languageCode:
+        text:
+        cityName: {{ postalAddress.postalStructuredAddress.cityName }}
+        geographicRegionName: 
+        postalCode: {{ postalAddress.postalStructuredAddress.postalCode }}
+        countryCode: {{ postalAddress.postalStructuredAddress.countryCode }}
+      {% endcall %}
+    {% call(postalAddress) match('postalAddress', holder.contact.contactTypeChoiceSequence.postalAddressBag) %}
+    countryCode: {{ postalAddress.postalStructuredAddress.countryCode }}
+    {% endcall %}
+  {% endcall %}
+
 # licence information, not frequent, but provided by Singapore, Norway and UK as of 2025-04-23
 licences:
   {% call(record) match('markRecord', trademark.markRecordBag) %}
@@ -215,7 +241,7 @@ licences:
     effectiveDate: {{ record.recordLicence.recordEffectiveDate }}
     licensee:
       {% call(licensee) match('licensee', licence.licenseeBag) %}
-      - identifier:
+      - identifier: {{ licensee.partyIdentifier | get_local_text() }}
         kind:
         fullName:
           - languageCode:

gbdtransformation/brands/xxxx/template.yml

@@ -195,6 +195,42 @@ applicants:
       url:
     countryCode: # sometimes, country name is provided instead
 
+# if different from applicants, and explicitely distinguished from them
+holders:
+  - identifier:
+    kind:
+    fullName:
+      - languageCode:
+        text:
+    firstName:
+      - languageCode:
+        text:
+    lastName:
+      - languageCode:
+        text:
+    middleName:
+      - languageCode:
+        text:
+    organizationName:
+      - languageCode:
+        text:
+    fullAddress:
+      - languageCode:
+        text:
+    detailedAddress:
+      - languageCode:
+        text:
+        cityName:
+        geographicRegionName:
+        postalCode:
+        countryCode:
+    contact:
+      phone: 
+      fax: 
+      email: 
+      url:
+    countryCode: # sometimes, country name is provided instead
+
 representatives:
   - identifier:
     kind:

{wipo_gbd_transformation-1.1.79.dist-info → wipo_gbd_transformation-1.1.81.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wipo-gbd-transformation
-Version: 1.1.79
+Version: 1.1.81
 Summary: GBD XML ETL package
 Home-page: https://github.com/GBD-Wipo/xmlE
 Author: WIPO GDB team

{wipo_gbd_transformation-1.1.79.dist-info → wipo_gbd_transformation-1.1.81.dist-info}/RECORD

@@ -150,9 +150,9 @@ gbdtransformation/brands/gstm/filters.py,sha256=QGOXTX5HsoOoxfY9a31adtujzOS7C0KQ
 gbdtransformation/brands/gstm/template.gs.yml,sha256=tQOXTIpmurgytddfqyWvKuCx-7K6ZxALMGXLn0mjg0s,1711
 gbdtransformation/brands/gstm/template.yml,sha256=INQBe908BttDal83tMEXkpAOTasJ0vo5Myl_kFuatR8,1000
 gbdtransformation/brands/hrtm/__init__.py,sha256=UHmbQDIPDdApISBKfO9tKOX6LgUQ_Ib-IVMR5kCVMTY,86
-gbdtransformation/brands/hrtm/filters.py,sha256=jFQvK41R17Rdl5xBzGXmK-M0u0EVp81AhrfJSicMrkY,4340
+gbdtransformation/brands/hrtm/filters.py,sha256=QYkXkWS4F-Hvs1JgMUBDD69pe6OBCdft04dOGH8O5Rk,5220
 gbdtransformation/brands/hrtm/schema,sha256=7jQ-PC0VTx5NZ79Qf8xAZEX8sqFSUtjPwsvVYV8XZAs,1376
-gbdtransformation/brands/hrtm/template.yml,sha256=pMwur5_WPSWtQQb6-nhu9MjtF47sxvvaA36a2VDLsEY,9543
+gbdtransformation/brands/hrtm/template.yml,sha256=dzgqIyM9tKHEiVJswxbw2eWyDo4nNRnN2Aj8awKsg9U,9644
 gbdtransformation/brands/idtm/__init__.py,sha256=MBVFGkMlqAi-s2ur7pCLYe2uxtjIxx9n9wo2bpESvxU,311
 gbdtransformation/brands/idtm/filters.py,sha256=HbcLmB9KTBFjLwHJdkJmM-u5wdE2JmxlqJvlSz1cTKk,3018
 gbdtransformation/brands/idtm/schema,sha256=TFrF4FR76cytcbtQkDWxtF74I0tCPRDIvWRFeqaJt6Q,3242
@@ -297,8 +297,8 @@ gbdtransformation/brands/natm/schema,sha256=TFrF4FR76cytcbtQkDWxtF74I0tCPRDIvWRF
 gbdtransformation/brands/natm/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/brands/natm/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gbdtransformation/brands/notm/__init__.py,sha256=YRZPymjJv7V5vqjphBN1UOHZ3RL1oeYYqaOI6AKInl0,88
-gbdtransformation/brands/notm/filters.py,sha256=KNc0PXlUgKm3SRhKGn0SUHJ_Zg2YvIvfQZnP8qoARzc,5811
-gbdtransformation/brands/notm/template.yml,sha256=iNPRI1DSe7LKzt-jFHNcd2DBeo-0yGd-xr1nZK9pYL0,10156
+gbdtransformation/brands/notm/filters.py,sha256=_uALPpBX550Toz-9-uhDMGHSwCVbplUejZyFbigBDBg,5894
+gbdtransformation/brands/notm/template.yml,sha256=v1acXfx4_L62Xo3ipaqwp4UcIwFv6bo8euiMloFSsr8,11448
 gbdtransformation/brands/nztm/__init__.py,sha256=UHmbQDIPDdApISBKfO9tKOX6LgUQ_Ib-IVMR5kCVMTY,86
 gbdtransformation/brands/nztm/filters.py,sha256=dAjrg03Yq37H10oAM8rnAMNa71lZHuG1uMwHi25kIvA,4211
 gbdtransformation/brands/nztm/schema,sha256=tpcyNMtmiBQQ0FsxKKTASRSo4nbrw0j0_b1nhELyAzE,6355
@@ -457,7 +457,7 @@ gbdtransformation/brands/wstm/tests/test.xml.gz,sha256=UKm7LTvKaETUtHMKurFGqkqXO
 gbdtransformation/brands/xxxx/__init__.py,sha256=fricc3VHm4BwGRFKIIqB0t-NtP3tTVRrEYee_gWpiFo,172
 gbdtransformation/brands/xxxx/filters.py,sha256=YCaQ6yH2LINwCQvbPHDhnORQyWglbswLlSOY6ur3KXQ,1874
 gbdtransformation/brands/xxxx/schema,sha256=g_oWkd7k2e5fAQR1BdNkPSsIgP3dkTyc7esWo_UOHQA,163
-gbdtransformation/brands/xxxx/template.yml,sha256=EM5IES2irQvlNvylR_JRmIAtrUna0QzJKK5Jr_RqdzY,7104
+gbdtransformation/brands/xxxx/template.yml,sha256=iSd8nrMtih3aDEA11m0k67wRS0wcfwlGkEk2H6wCPpc,7799
 gbdtransformation/brands/zmtm/__init__.py,sha256=Mtsi_-CaLQirHkhnletNhJ4li-pZlzEZMcKjv6mEk50,256
 gbdtransformation/brands/zmtm/filters.py,sha256=FkGfv3nPiYDUy97O7bDzPp824qoDsqX-oh2Ox01NTpA,2344
 gbdtransformation/brands/zmtm/schema,sha256=TFrF4FR76cytcbtQkDWxtF74I0tCPRDIvWRFeqaJt6Q,3242
@@ -585,9 +585,9 @@ 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.79.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
-wipo_gbd_transformation-1.1.79.dist-info/METADATA,sha256=M538k3cZRwBsMXVlKEKGUZJ6AZ8pUKao5BRFboF7DAk,577
-wipo_gbd_transformation-1.1.79.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-wipo_gbd_transformation-1.1.79.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
-wipo_gbd_transformation-1.1.79.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
-wipo_gbd_transformation-1.1.79.dist-info/RECORD,,
+wipo_gbd_transformation-1.1.81.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
+wipo_gbd_transformation-1.1.81.dist-info/METADATA,sha256=cRaqudy_3wfdDpQBAd4540Lq319E6Zxb53NpUXqCyzY,577
+wipo_gbd_transformation-1.1.81.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+wipo_gbd_transformation-1.1.81.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
+wipo_gbd_transformation-1.1.81.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
+wipo_gbd_transformation-1.1.81.dist-info/RECORD,,