wipo-gbd-transformation 1.1.82__py3-none-any.whl → 1.1.84__py3-none-any.whl

gbdtransformation/brands/detm/filters.py

@@ -14,7 +14,8 @@ def translate_status(trademark):
 
     if trademark.STATUSAPPLICATION == 'true': return ('Pending', 'Application filed')
 
-    raise Exception('Could not deduce status')
+    return 'Unknown'
+    #raise Exception('Could not deduce status')
 
 def translate_kind(kind):
     if not kind: return ['Individual']
@@ -23,7 +24,8 @@ def translate_kind(kind):
     if kind == 'kollektiv': return ['Collective']
     if kind == 'gewaehrleistung': return ['Certificate']
 
-    raise Exception('kind "%s" is not mapped' % kind)
+    return 'Other'
+    #raise Exception('kind "%s" is not mapped' % kind)
 
 def translate_feature(feature):
     if not feature: return 'Undefined'
@@ -42,15 +44,30 @@ def translate_feature(feature):
     if feature.WORD: return 'Word'
     if feature.WORDIMAGE: return 'Figurative'
 
-
-    raise Exception('Feature could not be deduced')
-
+    return 'Unknown'
+    #raise Exception('Feature could not be deduced')
 
 # if Registered or Expired =>
 # if RENEWALDATE: 10y after RENEWALDATE and endofmonth of FILDATE
 # else: 10y and endofmonth of FILDATE
+
+# PL: Missing cancelation 
+
 def get_expiry_date(trademark, gbd_status):
     if gbd_status in ['Registered', 'Expired']:
+
+        if trademark.STATUSCANCELLED == "true":
+            # expiry date is cancelation date, which in this case is the same as the PROCDATE
+            pdate = trademark.PROCDATE
+            if pdate:
+                try:
+                    pdate = datetime.strptime(pdate.strip(), '%Y-%m-%dT%H:%M:%S')
+                    pdate = pdate.date()
+                except:
+                    pdate = None
+                if pdate:
+                    return pdate
+
         rdate = trademark.RENEWALDATE
         fdate = trademark.FILDATE
         edate = datetime.strptime(rdate if rdate else fdate, '%Y-%m-%d')

gbdtransformation/brands/ustm/__init__.py

@@ -6,28 +6,23 @@ status_map = {
     '000': {'gbd': 'Delete', 'office': 'Indifferent'},
     '626': {'gbd': 'Delete', 'office': 'Dead/Cancelled'},
 
-    '416': {'gbd': 'Unknown', 'office': 'Other'},
-    '901': {'gbd': 'Unknown', 'office': 'Other'},
-    '968': {'gbd': 'Unknown', 'office': 'Other'},
-    '969': {'gbd': 'Unknown', 'office': 'Other'},
+    '622': {'gbd': 'Other', 'office': 'Indifferent'},
 
-    '900': {'gbd': 'Expired', 'office': 'Dead/Expired'},
-
-    '622': {'gbd': 'Ended', 'office': 'Dead/Refused'},
-    '632': {'gbd': 'Ended', 'office': 'Dead/Refused'},
-    '401': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
-    '400': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
+    
+    '401': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
+    '400': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
     '402': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
     '403': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
     '404': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
-    '405': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
+    '405': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
     '406': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
     '411': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
     '412': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
     '414': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
     '415': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
+    '416': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
     '417': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
-    '618': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
+
     '600': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
     '601': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
     '602': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
@@ -38,17 +33,20 @@ status_map = {
     '607': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
     '608': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
     '609': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
-    '610': {'gbd': 'Ended', 'office': 'Dead/Refused/Dismissed'},
+    '610': {'gbd': 'Ended', 'office': 'Dead'},
     '612': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
     '614': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
+    '618': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
+    '632': {'gbd': 'Ended', 'office': 'Dead'},
+
     '709': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
     '710': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
     '711': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
     '712': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
     '713': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
     '714': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
-    '781': {'gbd': 'Ended', 'office': 'Cancelled/Invalidated'},
-    '782': {'gbd': 'Ended', 'office': 'Cancelled/Invalidated'},
+    '781': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
+    '782': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
 
     '700': {'gbd': 'Registered', 'office': 'Live/Registered'},
     '701': {'gbd': 'Registered', 'office': 'Live/Registered'},
@@ -59,9 +57,10 @@ status_map = {
     '706': {'gbd': 'Registered', 'office': 'Live/Registered'},
     '707': {'gbd': 'Registered', 'office': 'Live/Registered'},
     '708': {'gbd': 'Registered', 'office': 'Live/Registered'},
+    '717': {'gbd': 'Registered', 'office': 'Live'},
     '624': {'gbd': 'Registered', 'office': 'Live/Registered'},
     '625': {'gbd': 'Registered', 'office': 'Live/Registered'},
-    '413': {'gbd': 'Registered', 'office': 'Live/Registered'},
+    
     '778': {'gbd': 'Registered', 'office': 'Live/Registered'},
     '780': {'gbd': 'Registered', 'office': 'Live/Registered'},
     '790': {'gbd': 'Registered', 'office': 'Live/Registered'},
@@ -69,6 +68,8 @@ status_map = {
     '800': {'gbd': 'Registered', 'office': 'Live/Registered'},
 
     '410': {'gbd': 'Pending', 'office': 'Live/Pending'},
+    '413': {'gbd': 'Pending', 'office': 'Live/Pending'},
+
     '616': {'gbd': 'Pending', 'office': 'Live/Pending'},
     '620': {'gbd': 'Pending', 'office': 'Live/Pending'},
     '630': {'gbd': 'Pending', 'office': 'Live/Pending'},
@@ -113,6 +114,7 @@ status_map = {
     '692': {'gbd': 'Pending', 'office': 'Live/Pending'},
     '693': {'gbd': 'Pending', 'office': 'Live/Pending'},
     '694': {'gbd': 'Pending', 'office': 'Live/Pending'},
+
     '718': {'gbd': 'Pending', 'office': 'Live/Pending'},
     '719': {'gbd': 'Pending', 'office': 'Live/Pending'},
     '720': {'gbd': 'Pending', 'office': 'Live/Pending'},
@@ -125,7 +127,8 @@ status_map = {
     '732': {'gbd': 'Pending', 'office': 'Live/Pending'},
     '733': {'gbd': 'Pending', 'office': 'Live/Pending'},
     '734': {'gbd': 'Pending', 'office': 'Live/Pending'},
-    # '740': {'gbd': 'Pending', 'office': ''},
+
+    '740': {'gbd': 'Pending', 'office': 'Live/Pending'},
     '744': {'gbd': 'Pending', 'office': 'Live/Pending'},
     '745': {'gbd': 'Pending', 'office': 'Live/Pending'},
     '746': {'gbd': 'Pending', 'office': 'Live/Pending'},
@@ -172,6 +175,13 @@ status_map = {
     '823': {'gbd': 'Pending', 'office': 'Live/Pending'},
     '824': {'gbd': 'Pending', 'office': 'Live/Pending'},
     '825': {'gbd': 'Pending', 'office': 'Live/Pending'},
-    '715': {'gbd': 'Pending', 'office': 'Live/Pending'},
-    '973': {'gbd': 'Unknown', 'office': 'Suspended Pending Administrative Review'},
+
+    '715': {'gbd': 'Pending', 'office': 'Indifferent/Cancelled'},
+
+    '900': {'gbd': 'Expired', 'office': 'Dead/Expired'},
+    '901': {'gbd': 'Ended', 'office': 'Dead'},
+    '968': {'gbd': 'Ended', 'office': 'Dead'},
+    '969': {'gbd': 'Pending', 'office': 'Live/Pending'},
+    '973': {'gbd': 'Unknown', 'office': 'Suspended Pending Administrative Review'}
+    
 }

gbdtransformation/brands/ustm/filters.py

@@ -4,14 +4,16 @@ from . import status_map
 # namespaces defined in XML and to be ignored in procecssing
 ignore_namespace = []
 
-
-# -------------------------------------------------------------
-# data translation helpers:
-# translate values from office interpretation to gbd equivalent
-# -------------------------------------------------------------
+# WARNING: pypers is making a transformation of the original USPTO XML
+# into a "compressed" format that changes in particula the names of tags
+# for example <mark-drawing-code> becomes <drawCode>, so
+# the USPTO documentation has to be "translated" to this weirdo intermediary
+# format (why doing simple and readable? :)
+# to see this "pypers" mapping: 
+# https://git.wipo.int/projects/BDDS/repos/gbd_etl_pypers/browse/pypers/steps/fetch/extract/us/ustm-tags.xml
 
 def translate_kind(flags):
-    is_tradmark           = flags[2] == '1'
+    is_trademark           = flags[2] == '1'
     is_collective         = flags[3] == '1'
     is_service            = flags[4] == '1'
     is_service_collective = flags[5] == '1'
@@ -19,21 +21,24 @@ def translate_kind(flags):
     is_certificate        = flags[7] == '1'
 
     kind = []
-    if is_tradmark          : kind = [ 'Individual' ]
+    if is_trademark          : kind = [ 'Individual' ]
     if is_collective        : kind = [ 'Collective' ]
     if is_service           : kind = [ 'Individual' ]
     if is_service_collective: kind = [ 'Collective' ]
     if is_membership_collective : kind = [ 'Membership', 'Collective' ]
     if is_certificate       : kind = [ 'Certificate' ]
 
-    if len(kind): return kind
-    else: return ['Other']
+    if len(kind): 
+        return kind
+    else: 
+        return ['Other']
 
 def translate_status(status):
     """translation of mark status"""
     # a required data from office. if not present and no way to guess,
     # return Unknown
-    if not status: return 'Unknown'
+    if not status: 
+        return 'Unknown'
 
     try:
         return status_map[status]
@@ -41,23 +46,26 @@ def translate_status(status):
         return ['Unknown']
         #raise Exception('Status "%s" unmapped' % status)
 
-
 def translate_feature(drawcode):
     if not drawcode: return 'Undefined'
 
     code = drawcode [0]
+    # PL: '0' means "Mark drawing code not yet assigned"
     if code == '1': return 'Word' #1000
     if code == '2': return 'Figurative'
     if code == '3': return 'Combined'
     if code == '4': return 'Word' #4000
     if code == '5': return 'Stylized characters'
-    if code == '6': return 'Olfactory' #6000
+    # PL: the code '6'' was incorrectly mapped to 'Olfactory', 
+    # Official documentation: '6' means "Where no drawing is possible, such as for sound", so it means "other".
+    # Unfortunately until June 2025, everything was mapped to 'Olfactory', so sound or 3D trademarks are all
+    # 'Olfactory' in GBD until this date
+    if code == '6': return 'Other' #6000
 
     return ['Other']
+    # note: documentation explains that mark-drawing-code is optional, so we don't want to raise an exception here
     #raise Exception('DrawCode "%s" unmapped' % drawcode)
 
-##-----------------
-
 def get_img_class(dessearches):
     if not dessearches: return None
     if not isinstance(dessearches, list):

gbdtransformation/brands/ustm/template.yml

@@ -1,3 +1,11 @@
+# WARNING: pypers is making a transformation of the original USPTO XML
+# into a "compressed" format that change the names of tags
+# for example <mark-drawing-code> becomes <drawCode>, so
+# the USPTO documentation has to be "translated" to this weirdo intermediary
+# format (why doing simple and readable? :)
+# to see this "pypers" mapping: 
+# https://git.wipo.int/projects/BDDS/repos/gbd_etl_pypers/browse/pypers/steps/fetch/extract/us/ustm-tags.xml
+
 {% from 'navigation.tmpl' import match %}
 
 {% set flags = file.head._flags %}

gbdtransformation/brands/xxxx/template.yml

@@ -24,7 +24,7 @@
 type: # (TRADEMARK|EMBLEM|AO|GI|INN)
 kind:
   - str # (Individual|Collective|Certificate|Defensive|Other|Membership|Undefined)
-markFeature: # (Word|Stylized characters|Figurative|Combined|Three dimensional|Colour|Sound|Hologram|Olfactory|Motion|Municipal|Chimney|Other|Undefined)
+markFeature: # (Word|Stylized characters|Figurative|Combined|Three dimensional|Colour|Sound|Hologram|Olfactory|Motion|Municipal|Chimney|Other|Undefined|Unknown)
 
 registrationOfficeCode:
 designatedCountries:

{wipo_gbd_transformation-1.1.82.dist-info → wipo_gbd_transformation-1.1.84.dist-info}/METADATA

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

{wipo_gbd_transformation-1.1.82.dist-info → wipo_gbd_transformation-1.1.84.dist-info}/RECORD

@@ -89,7 +89,7 @@ gbdtransformation/brands/cutm/schema,sha256=TFrF4FR76cytcbtQkDWxtF74I0tCPRDIvWRF
 gbdtransformation/brands/cutm/template.yml,sha256=TiC6Nf2MF8l1srCpvChPcS99KBaXSy-BGIVRkqQZVtU,138
 gbdtransformation/brands/cutm/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gbdtransformation/brands/detm/__init__.py,sha256=eSKSOkwspXF3U7Sv7Z2KkOQSqzvghK5dD9vR-pmEPKQ,418
-gbdtransformation/brands/detm/filters.py,sha256=kR_OKuRWEXymKKz-brh6CoO4kIsrvK-W2hGfgLsH0Yk,2611
+gbdtransformation/brands/detm/filters.py,sha256=n-Y3dLxtgIRMCSoFqDXuKluf_uBwa-CXory8wCwmcXQ,3167
 gbdtransformation/brands/detm/schema,sha256=SxOjgWehtwDP01TPFmMGsjWs1Sz6ijUlHB8WUMSBOeU,9451
 gbdtransformation/brands/detm/template.yml,sha256=Co2eFATPhDHDN0dz4tNNJsL8Mpl7qm2W6ejhZxEjHBg,3880
 gbdtransformation/brands/dktm/__init__.py,sha256=lQh4-cQE0kvjM75miSkI2As4xEgb9Em_4lJfnbgAbS8,180
@@ -407,10 +407,10 @@ gbdtransformation/brands/uatm/__init__.py,sha256=CLZvaGREoJUDCyrrMWlsyBs1Fe6lJHP
 gbdtransformation/brands/uatm/filters.py,sha256=Er8L7T5If-2s_oDZIhgIpUKBTHR9gN1ZVlG_csLmrT4,2202
 gbdtransformation/brands/uatm/schema,sha256=xyi3dhfyhzwFzeNA4vl5CZ_3FGNm6kcePHQt4Nd_qWM,4318
 gbdtransformation/brands/uatm/template.yml,sha256=7E7Q9HUg8aFdiwzpYYqB0LIWbkG_zkRh8mGVpk7fL6k,5974
-gbdtransformation/brands/ustm/__init__.py,sha256=kTDTnS4FtOCbvjeHCz0Tt2fXvlQ-I5ukdgvm8ECBW44,9679
-gbdtransformation/brands/ustm/filters.py,sha256=INsDDZ2KvvfYuN4CvPuRu1d-G-e2cLUwh8BbcqJ5fJ8,5234
+gbdtransformation/brands/ustm/__init__.py,sha256=nAKYGg8pFwhesOakhSSbHADYx422ODF73hEIjbswwOw,9731
+gbdtransformation/brands/ustm/filters.py,sha256=_-Fk0jN3es5yr8AtRjYUXZ9ZTqmKMaJZrTAwQsPiJGw,5978
 gbdtransformation/brands/ustm/schema,sha256=7vcbDMFy76nAxZ5dRjssbOhHNFOqVIlVldrNssBB1Mc,133581
-gbdtransformation/brands/ustm/template.yml,sha256=92F8h-MT_m6S0QACKlJyldWHP1CWJKRpzdJDyC1zoeY,4582
+gbdtransformation/brands/ustm/template.yml,sha256=btWlXhetvAFnng9IFMi264ZgXur2KRl_7er1GYGFt-8,5033
 gbdtransformation/brands/uytm/__init__.py,sha256=UHmbQDIPDdApISBKfO9tKOX6LgUQ_Ib-IVMR5kCVMTY,86
 gbdtransformation/brands/uytm/filters.py,sha256=i7SBMVTF70OERVdsS3Dfv19S3-9kyxE-y4aYA59YxA4,1976
 gbdtransformation/brands/uytm/schema,sha256=uMd1E_XRVQ_wHVrGq5fqFH6Fyg8cWx2DTQbVvH8tmmA,3730
@@ -457,7 +457,7 @@ gbdtransformation/brands/wstm/tests/test.xml,sha256=YH6ym16Jot43w37Q4zRMktjXhrpd
 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=iSd8nrMtih3aDEA11m0k67wRS0wcfwlGkEk2H6wCPpc,7799
+gbdtransformation/brands/xxxx/template.yml,sha256=0aNF040tiUwhb-Ujm0OmHNq0do9s_W6RX2cgEtOAOWs,7807
 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.82.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
-wipo_gbd_transformation-1.1.82.dist-info/METADATA,sha256=5G1462Li5V2PhyuAKQfj83fZTzJrHSDvtJgxXOLeIFk,577
-wipo_gbd_transformation-1.1.82.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-wipo_gbd_transformation-1.1.82.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
-wipo_gbd_transformation-1.1.82.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
-wipo_gbd_transformation-1.1.82.dist-info/RECORD,,
+wipo_gbd_transformation-1.1.84.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
+wipo_gbd_transformation-1.1.84.dist-info/METADATA,sha256=v0jD6sQSUrdlPctbdJPhaAyCEMHj5yAAVkWY3CwYKjM,577
+wipo_gbd_transformation-1.1.84.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+wipo_gbd_transformation-1.1.84.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
+wipo_gbd_transformation-1.1.84.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
+wipo_gbd_transformation-1.1.84.dist-info/RECORD,,