wipo-gbd-transformation 1.1.60__py3-none-any.whl → 1.1.61__py3-none-any.whl

gbdtransformation/brands/emtm/filters.py

@@ -70,7 +70,8 @@ def translate_feature(feature):
     if feature.capitalize() in std_features:
         return feature.capitalize()
 
-    raise Exception('Feature "%s" unmapped' % feature)
+    return 'Unknown'
+    #raise Exception('Feature "%s" unmapped' % feature)
 
 
 def get_registration_nb(trademark, tmstatus):
@@ -106,4 +107,5 @@ def translate_status(trademark):
     if status == 'Registered': return 'Registered'
     if status == 'Registration expired': return 'Expired'
 
-    raise Exception('Status "%s" not mapped.' % status)
+    return 'Unknown'
+    #raise Exception('Status "%s" not mapped.' % status)

gbdtransformation/brands/emtm/template.yml

@@ -7,6 +7,7 @@
 
 {% set _space = " " %}
 {% set status = TradeMark | translate_status %}
+{% set st13 = TradeMark.ApplicationNumber | st13('EM') %}
 
 st13: {{ TradeMark.ApplicationNumber | st13('EM') }}
 gbdStatus: {{ status }}
@@ -108,49 +109,22 @@ appeals:
     date: {{ apeal.AppealEventDate }}
   {% endcall %}
 applicants:
-  {% call(applicant) match('ApplicantDetails.Applicant', TradeMark) %}
+  {% call(applicant) match('ApplicantDetails.ApplicantKey', TradeMark) %}
   {% if not applicant._operationCode == 'Delete' %}
-  - identifier: {{ applicant.ApplicantIdentifier }}
-    kind: {{ applicant.ApplicantLegalEntity }}
-    fullName:
-      - languageCode: {{ TradeMark.ApplicationLanguageCode }}
-        text: {{ applicant.ApplicantAddressBook.FormattedNameAddress.Name.FormattedName.OrganizationName }}
-    fullAddress:
-      - languageCode: {{ TradeMark.ApplicationLanguageCode }}
-        text: {{ applicant.ApplicantAddressBook.FormattedNameAddress.Address.FormattedAddress | format_address }}
-    contact:
-      phone: {{ applicant.ApplicantAddressBook.ContactInformationDetails.Phone }}
-      fax: {{ applicant.ApplicantAddressBook.ContactInformationDetails.Fax }}
-      email: {{ applicant.ApplicantAddressBook.ContactInformationDetails.Email }}
-      url: {{ applicant.ApplicantAddressBook.ContactInformationDetails.URL }}
-    countryCode: {{ applicant.ApplicantAddressBook.FormattedNameAddress.Address.AddressCountryCode }}
+  - {{ applicant.Identifier | get_entity_from_db(TradeMark.RegistrationOfficeCode, 'APP', st13) | field_name}}
   {% endif %}
   {% endcall %}
 
 representatives:
-  {% call(representative) match('RepresentativeDetails.Representative', TradeMark) %}
+  {% call(rep) match('RepresentativeDetails.RepresentativeKey', TradeMark) %}
   {% if not representative._operationCode == 'Delete' %}
-  - identifier: {{ representative.RepresentativeIdentifier }}
-    kind: {{representative.RepresentativeLegalEntity | append(' (') | append(representative.RepresentativeTypeCode) | append(')')}}
-    {% call(fna) match('RepresentativeAddressBook.FormattedNameAddress', representative)%}
-    fullName:
-      - languageCode: {{ TradeMark.ApplicationLanguageCode }}
-        text: {{ fna.Name.FormattedName | format_name }}
-    fullAddress:
-      - languageCode: {{ TradeMark.ApplicationLanguageCode }}
-        text: {{ fna.Address.FormattedAddress | format_address }}
-    contact:
-      phone: {{ representative.RepresentativeAddressBook.ContactInformationDetails.Phone }}
-      fax: {{ representative.RepresentativeAddressBook.ContactInformationDetails.Fax }}
-      email: {{ representative.RepresentativeAddressBook.ContactInformationDetails.Email }}
-      url: {{ representative.RepresentativeAddressBook.ContactInformationDetails.URL }}
-    countryCode: {{ fna.Address.AddressCountryCode }}
-    {% endcall %}
+  - {{ rep.Identifier | get_entity_from_db(TradeMark.RegistrationOfficeCode, 'REP', st13) | field_name}}
   {% endif %}
   {% endcall %}
+
 correspondence:
-  {% call(rep) match('xxxCorrespondenceAddress', TradeMark) %}
-    {{ rep.CorrespondenceAddressIdentifier}}
+  {% call(rep) match('CorrespondenceAddress', TradeMark) %}
+    {{ rep.CorrespondenceAddressIdentifier | get_entity_from_db('EM', rep.CorrespondenceAddressParty, st13) | field_name}}
   {% endcall %}
 
 {% endif %}

gbdtransformation/brands/xxxx/template.yml

@@ -73,7 +73,7 @@ terminationDate:
 # status as is in the document
 officeStatus:
 # status as translated to gbdFormat
-gbdStatus:  # (Ended|Expired|Pending|Registered|Unknown)
+gbdStatus:  # (Ended|Expired|Pending|Registered|Unknown|Delete)
 # can also be the date of the last event in markevents if given
 statusDate:
 

gbdtransformation/common/filters.py

@@ -28,8 +28,15 @@ def load_collection_package(type, collection):
 def get_entity_from_db(value, collection, e_type, st13):
     e_type = e_type[0:3].upper()
     key = "%s.%s.%s" % (collection.lower(), e_type, value)
+    #dynamodb = boto3.resource('dynamodb',
+    #                          endpoint_url=os.environ.get('DYNAMO_DB'))
     dynamodb = boto3.resource('dynamodb',
-                              endpoint_url=os.environ.get('DYNAMO_DB'))
+                              endpoint_url=os.environ.get('DYDB_URL'))
+    #dynamodb = boto3.resource('dynamodb', 
+    #    region_name="eu-west-1", 
+    #    aws_access_key_id='anything',
+    #    aws_secret_access_key='anything',
+    #    endpoint_url="http://localhost:8001")
     table = dynamodb.Table('gbd_pypers_entity')
     response = table.get_item(Key={
         'entity_id': key}).get('Item', {})

gbdtransformation/commons/filters.py

@@ -0,0 +1 @@
+ignore_namespace = ['http://www.euipo.europa.eu/EUTM/EUTM_Download']

{wipo_gbd_transformation-1.1.60.dist-info → wipo_gbd_transformation-1.1.61.dist-info}/METADATA

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

{wipo_gbd_transformation-1.1.60.dist-info → wipo_gbd_transformation-1.1.61.dist-info}/RECORD

@@ -110,9 +110,9 @@ gbdtransformation/brands/egtm/schema,sha256=AP0MxQyD0hY4APRh8nxitlxMqJYJB4AaaTJ8
 gbdtransformation/brands/egtm/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/brands/egtm/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gbdtransformation/brands/emtm/__init__.py,sha256=9J9MpkcIR-7PWVjbzvT-ey9F400wxdlRAQF5ZiX8FX8,91
-gbdtransformation/brands/emtm/filters.py,sha256=xHkvSRnkkpUxLzUcLGNfVbdReLcB9vhz0ybT0oCdeP0,3250
+gbdtransformation/brands/emtm/filters.py,sha256=vUAFaOGOx2l7VhIf1DcyyNfoGpJLudBP4wYm8ukCMCM,3294
 gbdtransformation/brands/emtm/schema,sha256=CCZ2HtmgidPqBs9byleAC6ksQ6jFgclmVewH3Vnex8w,9643
-gbdtransformation/brands/emtm/template.yml,sha256=xNNQTLiI7aDU5or7ByodxPVMjean2kTvkzbz3L8bWgw,7135
+gbdtransformation/brands/emtm/template.yml,sha256=L0pDlLO_xwksy_Bb_BiNSgorFAAysaPcojmJJnu4UZw,5561
 gbdtransformation/brands/estm/__init__.py,sha256=UHmbQDIPDdApISBKfO9tKOX6LgUQ_Ib-IVMR5kCVMTY,86
 gbdtransformation/brands/estm/filters.py,sha256=GzhXr2dnPmZ4l71q0a3ulNTJgdpLQI6qcQcNEK8E5Co,3553
 gbdtransformation/brands/estm/schema,sha256=y7ZeQPuHez-DbBs1wnQjkyPvQ3hQ2uX5eNdrimCnFh4,3334
@@ -452,7 +452,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=asJd5FHB2g5mfneMMqIkTSR9w3w-AUROnO6YgTyaR00,4665
+gbdtransformation/brands/xxxx/template.yml,sha256=yQJOtXcpbpsJRkVY2HBvY9ih39YFN0hSfgYqsGDFD6Y,4672
 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
@@ -464,7 +464,7 @@ gbdtransformation/brands/zwtm/schema,sha256=TFrF4FR76cytcbtQkDWxtF74I0tCPRDIvWRF
 gbdtransformation/brands/zwtm/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/brands/zwtm/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gbdtransformation/common/__init__.py,sha256=D8Pro2OHR868UAos_APlN1LhUPWMyIDXmPxP81n3HTw,12644
-gbdtransformation/common/filters.py,sha256=1V02GK5d1tPmUVEiwZXzvc0eu4nSB9qItusUWGkobsw,10522
+gbdtransformation/common/filters.py,sha256=IRaUD7dCP-29VYrZ0Ea_YF2gesdKrLRDjPoHlXUb-PA,10845
 gbdtransformation/common/navigation.tmpl,sha256=EZtsUnfh8B1V2WzHZjH3ZRZ9c9WpCVpWYsxLhGg9-fw,346
 gbdtransformation/common/jpap/__init__.py,sha256=0zpD6c5XcsLqKBLRVgRUSImZrCQMgtYv9Na0lNV9CzU,16
 gbdtransformation/common/jpap/filters.py,sha256=78tglb02rkiOvGn-DipzrBpkFsmYF8pKOIan6j99QWs,2209
@@ -476,6 +476,7 @@ gbdtransformation/common/jprp/__init__.py,sha256=0zpD6c5XcsLqKBLRVgRUSImZrCQMgtY
 gbdtransformation/common/jprp/filters.py,sha256=89NR8ZgekoeGnRfhPkXjzasDfWLolsGs7rpcT_BSANc,2234
 gbdtransformation/common/jprp/template.yml,sha256=cgPMMyQouaGTW-AzWCNlWcMDY8S6CbJCd9w-SyT1uds,1459
 gbdtransformation/commons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+gbdtransformation/commons/filters.py,sha256=fsZTGgSwb7hOq1AyOaWOWwF9ibM_2jo7Fp0lK4zDyqM,69
 gbdtransformation/commons/emap/__init__.py,sha256=LPq1qlU4nPGFyKPsgKWZG9K2mV4vWR1OAZ1OGWH-NjU,16
 gbdtransformation/commons/emap/filters.py,sha256=CA7FRKxuhP1QVlB7hh6uIf7EVBXr1MkJ_NKAaP7nqBo,68
 gbdtransformation/commons/emap/template.yml,sha256=acb3nyjhNFSZa89KjIwrAhcc7Em2MrgjPgkvy-nBnYo,1308
@@ -579,9 +580,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.60.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
-wipo_gbd_transformation-1.1.60.dist-info/METADATA,sha256=7iqsd2Pnis4i0u0NUVK4b9cETsQaV7HB91EKdWxwCMI,577
-wipo_gbd_transformation-1.1.60.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-wipo_gbd_transformation-1.1.60.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
-wipo_gbd_transformation-1.1.60.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
-wipo_gbd_transformation-1.1.60.dist-info/RECORD,,
+wipo_gbd_transformation-1.1.61.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
+wipo_gbd_transformation-1.1.61.dist-info/METADATA,sha256=swTfmewc4j_5M7BKtpEmGF9KLZ01_3X2wRfOV_NdrSo,577
+wipo_gbd_transformation-1.1.61.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+wipo_gbd_transformation-1.1.61.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
+wipo_gbd_transformation-1.1.61.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
+wipo_gbd_transformation-1.1.61.dist-info/RECORD,,