wipo-gbd-transformation 1.1.46__py3-none-any.whl → 1.1.59__py3-none-any.whl

gbdtransformation/brands/chtm/template.yml

@@ -1,130 +1,121 @@
 {% from 'navigation.tmpl' import match %}
 
-{% call(info) match('marinfo', transac) %}
-{% set kind = info | get_kind %}
-type: TRADEMARK
-kind: {{ kind }}
-
-markFeature: {{ info.martype | translate_feature(info.marart) }}
+{% set trademark = Trademark %}
+{% set status = trademark.MarkCurrentStatusCode | translate_status %}
+{% set officeCode = trademark.RegistrationOfficeCode %}
 
-registrationOfficeCode: CH
-designatedCountries:
-  - CH
+{% if officeCode == 'CH' %}
 
-st13: {{ info.basappn | st13('CH', appdate=info.basannd) }}
+st13: {{ trademark.ApplicationNumber.ApplicationNumberText | st13('CH', appdate=trademark.ApplicationDate) }}
+gbdStatus: {{ status }}
+registrationOfficeCode: {{ officeCode }}
+type: TRADEMARK
 
-applicationNumber: {{ info.basappn }}
-applicationDate: {{ info.basannd }}
-registrationNumber: {{ info.basregn }}
-registrationDate: {{ info.basregd }}
+{% if not status == 'Delete' %}
+kind: {{ tradenark.MarkCategory | translate_kind }}
+markFeature: {{ trademark.MarkRepresentation.MarkFeatureCategory | translate_feature }}
+designatedCountries: 
+  - {{ officeCode }}
 
-applicationLanguageCode: {{ info.origlan }}
+applicationNumber: {{ trademark.ApplicationNumber.ApplicationNumberText }}
+applicationDate: {{ trademark.ApplicationDate | convertdate('%Y-%m-%d') }}
+registrationNumber: {{ trademark | get_registration_nb(trademark.MarkCurrentStatusCode) }}
+registrationDate: {{ trademark.RegistrationDate }}
+applicationLanguageCode: 
+officeStatus: {{ trademark.MarkCurrentStatusCode }}
+statusDate: 
+expiryDate: {{ trademark.ExpiryDate }}
 
-expiryDate: {{ info.expirationdate }}
-terminationDate: {{ info.basdeld }}
+markDisclaimerDetails: 
 
-officeStatus: {{ info.basstate }}
-gbdStatus: {{ info.basstate | translate_status(info.basdeld) }}
-statusDate: {{ info.lastgazd }}
+markDescriptionDetails:
 
-markDisclaimerDetails:
-  - languageCode: {{ info.marrem | guess_language(info.origlan) }}
-    text: {{ info.marrem }}
+wordMarkSpecification:
+  markVerbalElement:
+    {% set verbalElement = trademark.MarkRepresentation.MarkReproduction.WordMarkSpecification.MarkSignificantVerbalElementText | clean_verbal_element %}
+    - text: {{ verbalElement }}
 
 markImageDetails:
-  - name: {{ info.marpicd }}
-    colourIndicator: {{ info.colclai | get_true_or_false }}
+  {% call(img) match('MarkImage', trademark.MarkRepresentation.MarkImageBag) %}
+  - name: {{ img.FileName }}
+    colourIndicator: {{ img.MarkImageColourClaimedText | get_true_or_false }}
     colourClaimed:
-      - languageCode: {{ info.colclai | guess_language }}
-        text: {{ info.colclai }}
-
-{% set verbal = info | get_verbal %}
-wordMarkSpecification:
-  markVerbalElement:
-    - languageCode: {{ verbal | guess_language(default=info.origlan) }}
-      text: {{ verbal | trim }}
+      - text: {{ img.MarkImageColourClaimedText }}
+        languageCode: {{ img.MarkImageColourClaimedText | local_guess_language() }}
+    classification:
+      kind: Vienna
+      code:
+      - 
+  {% endcall %}
 
-{% set persons = info | get_roles %}
-applicants:
-{% for applicant in persons.applicants %}
-  - fullName:
-      - languageCode: {{ info.origlan }}
-        text: {{ applicant.name }}
-    fullAddress:
-      - languageCode: {{ info.origlan }}
-        text: {{ applicant.addr  }}
-    countryCode: {{ applicant.nat }}
-{% endfor %}
+markSoundDetails:
+  {% call(sound) match('MarkSoundDetails.MarkSound', trademark.MarkRepresentation.MarkSoundBag) %}
+  - filename: {{ sound.MarkSoundFilename }}
+    fileformat: {{ sound.MarkSoundFileFormat }}
+  {% endcall %}
 
-representatives:
-{% for representative in persons.representatives %}
-  - fullName:
-      - languageCode: {{ info.origlan }}
-        text: {{ representative.name }}
-    fullAddress:
-      - languageCode: {{ info.origlan }}
-        text: {{ representative.addr }}
-    countryCode: {{ representative.nat }}
-{% endfor %}
-
-{% if persons.correspondence %}
-correspondence:
-  fullName:
-    - languageCode: {{ info.origlan }}
-      text: {{ persons.correspondence.name }}
-  fullAddress:
-    - languageCode: {{ info.origlan }}
-      text: {{ persons.correspondence.addr }}
-  countryCode: {{ persons.correspondence.nat }}
-{% endif %}
+markVideoDetails:
+  {% call(video) match('MarkVideoDetails.MarkVideo', trademark.MarkRepresentation) %}
+  - filename: {{ video.MarkVideoFilename }}
+    fileformat: {{ video.MarkVideoFileFormat }}
+  {% endcall %}
 
-priorities:
-{% call(prio) match('prigr.prio', info) %}
-  - countryCode: {{ prio.prinat }}
-    number: {{ prio.prinr }}
-    date: {{ prio.priappd }}
-    comment: {{ prigr.prirem }}
-{% endcall %}
-
-{% set (nc_gs, gs) = info.gsgr | structure_gs %}
-{% if nc_gs.keys() | length > 0 %}
 goodsServicesClassification:
   kind: Nice
   version: {{ ASK_THE_OFFICE }}
-  class:
-    {% for cls, terms in nc_gs.items() %}
-    - code: {{ cls | int }}
-      {% if terms | length > 0 %}
+  class: 
+     {% call(ClassDescription) match('ClassDescription', trademark.GoodsServicesBag.GoodsServices.ClassDescriptionBag) %}
+    - code: {{ ClassDescription.ClassNumber| int }}
       terms:
-        {{ terms | guess_language(default=info.origlan) | field_name }}:
-          {% for term in terms %}
-          - {{ term }}
-          {% endfor %}
-      {% endif %}
-    {% endfor %}
-{% endif %}
+        {{ ClassDescription.GoodsServicesDescriptionText | local_guess_language() }}:
+        - {{ ClassDescription.GoodsServicesDescriptionText }}
+     {% endcall %}
 
-{% if gs | length > 0 %}
-goodsServicesUnclassified:
-  {{ gs | guess_language(default=info.origlan) | field_name }}:
-    {% for term in gs %}
-    - {{ term }}
-    {% endfor %}
-{% endif %}
+priorities:
+  {% call(priority) match('PriorityBag.Priority', trademark) %}
+  - countryCode: {{ priority.PriorityCountryCode }}
+    number: {{ priority.PriorityRegistrationNumber }}
+    date: {{ select_priority_date }}
+  {% endcall %}
+
+publications:
+  {% call(publication) match('PublicationBag.Publication', trademark) %}
+  - identifier: {{ publication.PublicationIdentifier }}
+    date: {{ publication.PublicationDate }}
+    section: {{ publication.PublicationPage }}
+  {% endcall %}
 
-# publications:
-# {% call(publ) match('marhist.histdata', transac) %}
-#   - identifier: {{ publ.artnr }}
-#     date: {{ publ.evdat }}
-#     section: {{ publ.gaznum }}
-# {% endcall %}
-
-extra:
-  {% call(opp) match('oppositiongr', info) %}
-  opposition:
-    state: {{ opp.oppositionstate }}
-    date: {{ opp.oppositiondate }}
+applicants:
+  {% call(Applicant) match('Applicant', trademark.ApplicantBag) %}
+  - identifier: 
+    kind: 
+    fullName:
+      - text: {{ Applicant.Contact.Name.PersonName.PersonFullName }}
+        languageCode: 
+    {% call(postalAddress) match('PostalAddress', Applicant.Contact.PostalAddressBag) %}
+    fullAddress:
+      {% set addr = postalAddress.PostalStructuredAddress | get_full_address %}
+      - text: {{ addr }} 
+        languageCode: {{ addr | local_guess_language() }}
+    countryCode: {{ postalAddress.PostalStructuredAddress.CountryCode }}
+    {% endcall %}
   {% endcall %}
 
-{% endcall %}
+representatives:
+  {% call(Representative) match('Representative', trademark.RepresentativeBag) %}
+  - identifier: 
+    kind: 
+    fullName:
+      - text: {{ Representative.Contact.Name.PersonName.PersonFullName }}
+        languageCode: 
+    {% call(postalAddress) match('PostalAddress', Representative.Contact.PostalAddressBag) %}
+    fullAddress:
+      {% set addr = postalAddress.PostalStructuredAddress | get_full_address %}
+      - text: {{ addr }} 
+        languageCode: {{ addr | local_guess_language() }} 
+    countryCode: {{ postalAddress.PostalStructuredAddress.CountryCode }}
+    {% endcall %}
+  {% endcall %}
 
+{% endif %}
+{% endif %}

gbdtransformation/brands/eetm/template.yml

@@ -6,9 +6,9 @@
 gbdStatus: {{ status }}
 st13: {{TradeMark.ApplicationNumber | st13('EE', appdate=appyear) }}
 registrationOfficeCode: EE
+type: TRADEMARK
 
 {% if not status == 'Delete' %}
-type: TRADEMARK
 kind:
   - Individual
 markFeature: {{TradeMark.MarkType | translate_feature}}

gbdtransformation/brands/emtm/template.yml

@@ -11,9 +11,9 @@
 st13: {{ TradeMark.ApplicationNumber | st13('EM') }}
 gbdStatus: {{ status }}
 registrationOfficeCode: EM
+type: TRADEMARK
 
 {% if not status == 'Delete' %}
-type: TRADEMARK
 kind: {{ TradeMark.KindMark | translate_kind }}
 markFeature: {{ TradeMark.MarkFeature | translate_feature }}
 designatedCountries:

gbdtransformation/brands/estm/template.yml

@@ -6,9 +6,9 @@
 st13: {{ TradeMark.ApplicationNumber | st13('ES', appdate=TradeMark.ApplicationDate) }}
 gbdStatus: {{ status }}
 registrationOfficeCode: {{ TradeMark.RegistrationOfficeCode }}
+type: TRADEMARK
 
 {% if not status == 'Delete' %}
-type: TRADEMARK
 kind: {{ TradeMark.KindMark | translate_kind }}
 markFeature: {{ TradeMark.MarkFeature | translate_feature }}
 designatedCountries:

gbdtransformation/brands/frtm/template.yml

@@ -11,9 +11,9 @@
 st13: {{ TradeMark.ApplicationNumber | st13('FR', appdate=TradeMark.ApplicationDate) }}
 gbdStatus: {{ status }}
 registrationOfficeCode: {{ TradeMark.RegistrationOfficeCode }}
+type: TRADEMARK
 
 {% if not status == 'Delete' %}
-type: TRADEMARK
 kind: {{ TradeMark.KindMark | translate_kind }}
 
 designatedCountries:

gbdtransformation/brands/gdtm/__init__.py

@@ -0,0 +1,5 @@
+render = 'JSON'
+source = 'national'
+
+# AE/321890
+appnum_mask = ['GD/T/(\\d{4})/(\\d*)', 'GD/T/(\\d*)/(\\d*)']

gbdtransformation/brands/gdtm/filters.py

@@ -0,0 +1,61 @@
+import gbdtransformation.brands.ipas.filters as ipas
+import gbdtransformation.common.filters as commons
+
+ignore_namespace = [
+   'http://www.wipo.int/standards/XMLSchema/trademarks',
+   'http://www.wipo.int/standards/XMLSchema/wo-trademarks']
+
+def get_appdate(appdate, appnum):
+    return ipas.get_appdate(appdate, appnum)
+
+def translate_type(header):
+    code = header.TransactionCode
+    if code == 'Trademark': return 'TRADEMARK'
+
+    raise Exception('Type "%s" is not mapped.' % code)
+
+def translate_kind(trademark, header):
+    subcode = header.TransactionSubCode
+    if subcode == 'Trademarks': return ['Individual']
+    # it is None for all
+    # kind = trademark.KindMark
+    raise Exception('Kind "%s" not mapped.' % subcode)
+
+def translate_status(trademark):
+    status = trademark.MarkCurrentStatusCode
+
+    return ipas.translate_status(status)
+
+def translate_feature(trademark):
+    feature = trademark.MarkFeature
+    if not feature: return 'Undefined'
+
+    return ipas.translate_feature(feature)
+
+def translate_event(event):
+    if not event: return 'Unknown'
+
+    return ipas.translate_event(event)
+
+def verbal_lang_map(markVerbalElements, applang=None):
+    return ipas.verbal_lang_map(markVerbalElements, applang=applang)
+
+def get_registration_nb(trademark, tmstatus):
+    if trademark.RegistrationNumber:
+        return trademark.RegistrationNumber
+    return None
+
+def get_expiry_date(trademark, tmstatus):
+    return ipas.get_expiry_date(trademark, tmstatus)
+
+def get_registration_date(trademark, tmstatus):
+    return ipas.get_registration_date(trademark, tmstatus)
+
+def is_international(header):
+    return False
+
+def get_ir_refnum(appnum):
+    return
+
+def get_goods_services(goods_services):
+    return ipas.get_goods_services(goods_services)

gbdtransformation/brands/gdtm/schema

@@ -0,0 +1,87 @@
+/Transaction
+__/TradeMarkTransactionBody
+____/TransactionContentDetails
+______/TransactionCode
+______/TransactionData
+________/TradeMarkApplication
+__________/TradeMarkDetails
+____________/TradeMark
+______________/ApplicantDetails
+________________/Applicant
+__________________/ApplicantAddressBook
+____________________/FormattedNameAddress
+______________________/Address
+________________________/AddressCountryCode
+________________________/FreeFormatAddress
+__________________________/FreeFormatAddressLine
+______________________/Name
+________________________/FreeFormatName
+__________________________/FreeFormatNameDetails
+____________________________/FreeFormatNameLine
+____________________________/FreeFormatNameLine[@languageCode=en]
+______________/ApplicationDate
+______________/ApplicationLanguageCode
+______________/ApplicationNumber
+______________/ExpiryDate
+______________/GoodsServicesDetails
+________________/GoodsServices
+__________________/ClassDescriptionDetails
+____________________/ClassDescription
+______________________/ClassNumber
+______________________/GoodsServicesDescription
+______________________/GoodsServicesDescription[@languageCode=en]
+______________/KindMark
+______________/MarkCurrentStatusCode
+______________/MarkCurrentStatusDate
+______________/MarkDisclaimerDetails
+________________/MarkDisclaimer
+________________/MarkDisclaimer[@languageCode=en]
+______________/MarkEventDetails
+________________/MarkEvent
+__________________/MarkEventCode
+__________________/MarkEventDate
+__________________/OfficeSpecificMarkEventCode
+__________________/OfficeSpecificMarkEventDescription
+__________________/OfficeSpecificMarkEventDescription[@languageCode=en]
+______________/MarkFeature
+______________/MarkImageDetails
+________________/MarkImage
+__________________/MarkImageCategory
+____________________/CategoryCodeDetails
+______________________/CategoryCode
+____________________/CategoryKind
+____________________/CategoryVersion
+__________________/MarkImageColourClaimedText
+__________________/MarkImageColourClaimedText[@languageCode=en]
+__________________/MarkImageFileFormat
+__________________/MarkImageFilename
+______________/PriorityDetails
+________________/Priority
+__________________/PriorityCountryCode
+__________________/PriorityDate
+__________________/PriorityNumber
+______________/PublicationDetails
+________________/Publication
+__________________/PublicationDate
+__________________/PublicationIdentifier
+______________/RegistrationDate
+______________/RegistrationNumber
+______________/RegistrationOfficeCode
+______________/RepresentativeDetails
+________________/Representative
+__________________/RepresentativeAddressBook
+____________________/FormattedNameAddress
+______________________/Address
+________________________/AddressCountryCode
+________________________/FreeFormatAddress
+__________________________/FreeFormatAddressLine
+______________________/Name
+________________________/FreeFormatName
+__________________________/FreeFormatNameDetails
+____________________________/FreeFormatNameLine
+____________________________/FreeFormatNameLine[@languageCode=en]
+______________/WordMarkSpecification
+________________/MarkVerbalElementText
+________________/MarkVerbalElementText[@languageCode=en]
+______/TransactionIdentifier
+______/TransactionSubCode

gbdtransformation/brands/gdtm/template.yml

@@ -0,0 +1 @@
+{% include "ipas/template.yml" %}

gbdtransformation/brands/istm/filters.py

@@ -10,23 +10,33 @@ def get_full_address(applicant):
 
 def translate_status(status, status_is):
     # office did not map to english -> we do it
-    if not status:
-        if status_is == 'Áfrýjun': return 'Pending' # Appeal
-        if status_is == 'Afturkallað': return 'Ended' # Revoked
-        if status_is == 'Birt': return 'Pending' # Published
-        if status_is == 'Andmæli': return 'Registered' # Published
-        if status_is == 'Krafa um niðurfellingu': return 'Ended' # Request for cancellation
-        if status_is == 'Tilbúið til birtingar': return 'Pending' # Ready for publishing
-        if status_is == 'Í rannsókn': return 'Registered' # Investigating ..
-        if status_is == 'Krafa um ógildingu': return 'Registered' # Claim for annulment ..
-        if status_is == 'Rannsóknarhæft': return 'Pending' #Researchable or in their office Application
+    if 'Áfrýjun' in status_is: return 'Pending' # Appeal
+    if status_is == 'Afturkallað': return 'Ended' # Revoked
+    if status_is == 'Birt': return 'Pending' # Published
+    if status_is == 'Andmæli': return 'Registered' # Published
+    if status_is == 'Krafa um niðurfellingu': return 'Ended' # Request for cancellation
+    if status_is == 'Tilbúið til birtingar': return 'Pending' # Ready for publishing
+    if status_is == 'Í rannsókn': return 'Registered' # Investigating ..
+    if status_is == 'Krafa um ógildingu': return 'Registered' # Claim for annulment ..
+    if status_is == 'Rannsóknarhæft': return 'Pending' #Researchable or in their office Application
+    if status_is == 'Fyrsta höfnun': return 'Pending' #First rejection or in their office Application
+    if status_is == 'Hafna': return 'Ended' #Rejection or in their office Application
+    if status_is == 'Vafamál': return 'Registered' #Investigating or in their office Application
+    if status_is == 'Endurupptökufrestur': return 'Pending' #Re-admission deadline (Trad)
+    if 'Í bi' in status_is: return 'Pending' #On hold
+    if 'nari sko' in status_is: return 'Pending'
+    if 'Rökstu' in status_is: return 'Pending'
+    if status_is == 'Rökstuningur': return 'Pending'
+    if status_is == 'Synja': return 'Ended'
+    if status_is == 'Umsögn hjá NS': return 'Pending'
+
 
     if status == 'Filed': return 'Pending'
     if status == 'Expired': return 'Expired'
     if status == 'Ended': return 'Ended'
     if status == 'Registered': return 'Registered'
+    return 'Unknown'
 
-    raise Exception('Status "%s/%s" unmapped' % (status, status_is))
 
 
 def translate_feature(feature, is3D):

gbdtransformation/brands/istm/template.yml

@@ -3,6 +3,7 @@
 {% set appdate = mark.applicationDate | convertdate('%d.%m.%Y %H:%M:%S') %}
 st13: {{ mark.vmid | st13('IS', appdate=appdate) }}
 registrationOfficeCode: IS
+type: TRADEMARK
 
 {% if mark.deleted | get_true_or_false %}
 gbdStatus: Delete
@@ -10,7 +11,6 @@ gbdStatus: Delete
 
 {% set status = mark.statusEN | translate_status(mark.status) %}
 
-type: TRADEMARK
 kind:
   - Individual
 

gbdtransformation/brands/krtm/template.yml

@@ -9,9 +9,9 @@
 gbdStatus: {{ status }}
 st13: {{ header.ApplicationNumber.ApplicationNumberText | st13('KR', appdate=appyear) }}
 registrationOfficeCode: KR # division marks donot have RegistrationOfficeCode
+type: TRADEMARK
 
 {% if not status == 'Delete' %}
-type: TRADEMARK
 kind:  {{ kind }}
 
 designatedCountries:

gbdtransformation/brands/lktm/__init__.py

@@ -0,0 +1,5 @@
+render = 'JSON'
+source = 'national'
+
+# AE/321890
+appnum_mask = 'LK/T/1/(\\d*)'

gbdtransformation/brands/lktm/filters.py

@@ -0,0 +1,83 @@
+import gbdtransformation.brands.ipas.filters as ipas
+import gbdtransformation.common.filters as commons
+
+ignore_namespace = [
+   'http://www.wipo.int/standards/XMLSchema/trademarks',
+   'http://www.wipo.int/standards/XMLSchema/wo-trademarks']
+
+def get_appdate(appdate, appnum):
+    return ipas.get_appdate(appdate, appnum)
+
+def translate_type(header):
+    code = header.TransactionCode
+    if code == 'Trademark': return 'TRADEMARK'
+    if code == 'Certification Trademark': return 'TRADEMARK'
+    return 'TRADEMARK'
+
+def translate_kind(trademark, header):
+    subcode = header.TransactionSubCode
+    if subcode == 'Individual Trademark': return ['Individual']
+    if subcode == 'Company/Partnership Trademark': return ['Individual']
+    if subcode == 'Collective Trademark':  return ['Collective']
+    if subcode == 'Certification Trademark':  return ['Individual']
+
+
+    # it is None for all
+    # kind = trademark.KindMark
+
+    raise Exception('Kind "%s" not mapped.' % subcode)
+    return ['Individual']
+
+def translate_status(trademark):
+    status = trademark.MarkCurrentStatusCode
+
+    if status == 'Converted': return 'Registered'
+
+    return ipas.translate_status(status)
+
+def translate_feature(trademark):
+    feature = trademark.MarkFeature
+
+    if not feature: return 'Undefined'
+
+    return ipas.translate_feature(feature)
+
+def translate_event(event):
+    if not event: return 'Unknown'
+
+    return ipas.translate_event(event)
+
+# ---------------------------------------
+# # language code is not accurate for markVerbalElement
+# def guess_language(text, lang, default):
+#     if commons.is_latin(text):
+#         return 'en'
+#     else:
+#         return commons.guess_language(text, lang, default)
+
+# TODO: separate values like
+# {'ar': ['BITUTAPE - بيتوتيب']}
+# {'ar': ['ديمه كابيتال Dimah Capital']}
+def verbal_lang_map(markVerbalElements, applang=None):
+    return ipas.verbal_lang_map(markVerbalElements, applang=applang)
+
+def get_registration_nb(trademark, tmstatus):
+    if trademark.RegistrationNumber:
+        return trademark.RegistrationNumber
+
+    return None
+
+def get_expiry_date(trademark, tmstatus):
+    return ipas.get_expiry_date(trademark, tmstatus)
+
+def get_registration_date(trademark, tmstatus):
+    return ipas.get_registration_date(trademark, tmstatus)
+
+def is_international(header):
+    return False
+
+def get_ir_refnum(appnum):
+    return
+
+def get_goods_services(goods_services):
+    return ipas.get_goods_services(goods_services)