followthemoney 3.6.3__tar.gz → 3.7.0__tar.gz

{followthemoney-3.6.3/followthemoney.egg-info → followthemoney-3.7.0}/PKG-INFO

@@ -1,12 +1,10 @@
 Metadata-Version: 2.1
 Name: followthemoney
-Version: 3.6.3
-Summary: UNKNOWN
+Version: 3.7.0
 Home-page: https://followthemoney.tech/
 Author: Organized Crime and Corruption Reporting Project
 Author-email: data@occrp.org
 License: MIT
-Platform: UNKNOWN
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
@@ -90,5 +88,3 @@ or `major` arguments.
 When the schema is updated, please update the docs, ideally including the
 diagrams. For the RDF namespace and JavaScript version of the model, 
 run `make generate`.
-
-

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/__init__.py

@@ -3,7 +3,7 @@ import os
 from followthemoney.model import Model
 from followthemoney.util import set_model_locale
 
-__version__ = "3.6.3"
+__version__ = "3.7.0"
 
 
 model_path = os.path.dirname(__file__)

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/mapping/entity.py

@@ -20,7 +20,6 @@ log = logging.getLogger(__name__)
 
 
 class EntityMapping(object):
-
     __slots__ = (
         "model",
         "name",
@@ -117,22 +116,30 @@ class EntityMapping(object):
             if prop.prop.type == registry.country:
                 discarded_values = prop.map(proxy, record, entities)
                 for value in discarded_values:
-                    log.warn(f"[{self.name}] Discarded unclean value \"{value}\" for property \"{prop.prop.qname}\".")
+                    log.warning(
+                        f'[{self.name}] Discarded unclean value "{value}" for property "{prop.prop.qname}".'
+                    )
 
         for prop in self.properties:
             if prop.prop.type != registry.country:
                 discarded_values = prop.map(proxy, record, entities)
                 for value in discarded_values:
-                    log.warn(f"[{self.name}] Discarding unclean value \"{value}\" for property \"{prop.prop.qname}\".")
+                    log.warning(
+                        f'[{self.name}] Discarding unclean value "{value}" for property "{prop.prop.qname}".'
+                    )
 
         # Generate the ID at the end to avoid self-reference checks on empty
         # keys.
         proxy.id = self.compute_key(record)
         if proxy.id is None:
             if self.id_column:
-                log.warn(f"[{self.name}] Skipping entity because no ID could be computed. Make sure that there are no empty values in the \"{self.id_column}\" column.")
+                log.warning(
+                    f'[{self.name}] Skipping entity because no ID could be computed. Make sure that there are no empty values in the "{self.id_column}" column.'
+                )
             if self.keys:
-                log.warn(f"[{self.name}] Skipping entity because no ID could be computed. Make sure that there are no empty values in key columns.")
+                log.warning(
+                    f"[{self.name}] Skipping entity because no ID could be computed. Make sure that there are no empty values in key columns."
+                )
             return None
 
         for prop in self.properties:
@@ -141,7 +148,9 @@ class EntityMapping(object):
                 # the mapping, not in the model. Basically it means: if
                 # this row of source data doesn't have that field, then do
                 # not map it again.
-                log.warn(f"[{self.name}] Skipping entity because required property \"{prop.prop.name}\" is empty.")
+                log.warning(
+                    f'[{self.name}] Skipping entity because required property "{prop.prop.name}" is empty.'
+                )
                 return None
         return proxy
 

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/proxy.py

@@ -220,8 +220,8 @@ class EntityProxy(object):
         # Somewhat hacky: limit the maximum size of any particular
         # field to avoid overloading upstream aleph/elasticsearch.
         value_size = len(value)
-        if prop.type.max_size is not None:
-            if self._size + value_size > prop.type.max_size:
+        if prop.type.total_size is not None:
+            if self._size + value_size > prop.type.total_size:
                 # msg = "[%s] too large. Rejecting additional values."
                 # log.warning(msg, prop.name)
                 return None
@@ -309,7 +309,7 @@ class EntityProxy(object):
         if self.schema.source_prop is not None and self.schema.target_prop is not None:
             sources = self.get(self.schema.source_prop)
             targets = self.get(self.schema.target_prop)
-            for (source, target) in product(sources, targets):
+            for source, target in product(sources, targets):
                 yield (source, target)
 
     def get_type_values(
@@ -414,7 +414,7 @@ class EntityProxy(object):
         for a more generous matching approach than the actual country values."""
         countries = set(self.countries)
         if not len(countries):
-            for (prop, value) in self.itervalues():
+            for prop, value in self.itervalues():
                 hint = prop.type.country_hint(value)
                 if hint is not None:
                     countries.add(hint)

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Airplane.yaml

@@ -1,7 +1,8 @@
 Airplane:
   label: Airplane
   plural: Airplanes
-  extends: Vehicle
+  extends:
+    - Vehicle
   description: >
     An airplane, helicopter or other flying vehicle.
   matchable: true

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Article.yaml

@@ -1,5 +1,6 @@
 Article:
-  extends: Document
+  extends:
+    - Document
   label: Article
   plural: Articles
   description: >

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Assessment.yaml

@@ -2,7 +2,8 @@ Assessment:
   # This is overly specific yet not useful. Should we phase it out?
   label: Assessment
   plural: Assessments
-  extends: Thing
+  extends:
+    - Thing
   matchable: false
   featured:
     - name

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Associate.yaml

@@ -2,7 +2,8 @@ Associate:
   label: "Associate"
   plural: "Associates"
   description: "Non-family association between two people"
-  extends: Interval
+  extends:
+    - Interval
   matchable: false
   featured:
     - person
@@ -16,7 +17,8 @@ Associate:
     label: "associated with"
     target: associate
     directed: false
-    caption: relationship
+    caption:
+      - relationship
   properties:
     person:
       label: "Person"

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Audio.yaml

@@ -1,5 +1,6 @@
 Audio:
-  extends: Document
+  extends:
+    - Document
   label: Audio
   plural: Audio files
   matchable: false

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/BankAccount.yaml

@@ -1,9 +1,10 @@
 BankAccount:
   label: Bank account
   plural: Bank accounts
-  extends: Asset
+  extends:
+    - Asset
   description: >
-    An account held at a bank and controlled by an owner. This may also be used 
+    An account held at a bank and controlled by an owner. This may also be used
     to describe more complex arrangements like correspondent bank settlement accounts.
   matchable: true
   featured:

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Contract.yaml

@@ -4,7 +4,8 @@ Contract:
   description: >
     An contract or contract lot issued by an authority. Multiple lots
     may be awarded to different suppliers (see ContractAward).
-  extends: Asset
+  extends:
+    - Asset
   matchable: false
   featured:
     - title

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/ContractAward.yaml

@@ -20,7 +20,8 @@ ContractAward:
     label: "awarded to"
     target: supplier
     directed: true
-    caption: lotNumber
+    caption:
+      - lotNumber
   properties:
     supplier:
       label: "Supplier"

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/CourtCase.yaml

@@ -1,7 +1,8 @@
 CourtCase:
   label: Court case
   plural: Court cases
-  extends: Thing
+  extends:
+    - Thing
   matchable: false
   featured:
     - name

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/CourtCaseParty.yaml

@@ -1,7 +1,8 @@
 CourtCaseParty:
   label: "Case party"
   plural: "Case parties"
-  extends: Interest
+  extends:
+    - Interest
   matchable: false
   featured:
     - party
@@ -15,7 +16,8 @@ CourtCaseParty:
     label: "involved in"
     target: case
     directed: true
-    caption: role
+    caption:
+      - role
   properties:
     party:
       label: "Party"

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Debt.yaml

@@ -18,7 +18,8 @@ Debt:
     label: "owes"
     target: creditor
     directed: true
-    caption: amount
+    caption:
+      - amount
   properties:
     debtor:
       label: "Debtor"

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Directorship.yaml

@@ -1,7 +1,8 @@
 Directorship:
   label: "Directorship"
   plural: "Directorships"
-  extends: Interest
+  extends:
+    - Interest
   matchable: false
   featured:
     - director
@@ -19,7 +20,8 @@ Directorship:
     label: "directs"
     target: organization
     directed: true
-    caption: role
+    caption:
+      - role
   properties:
     director:
       label: "Director"

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Documentation.yml

@@ -2,9 +2,10 @@ Documentation:
   label: "Documentation"
   plural: "Documentations"
   description: >
-    Links some entity to a document, which might provide further detail or 
+    Links some entity to a document, which might provide further detail or
     evidence regarding the entity.
-  extends: Interest
+  extends:
+    - Interest
   matchable: false
   featured:
     - document
@@ -18,7 +19,8 @@ Documentation:
     label: "documents"
     target: entity
     directed: false
-    caption: role
+    caption:
+      - role
   properties:
     document:
       label: "Document"

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Employment.yaml

@@ -1,7 +1,8 @@
 Employment:
   label: "Employment"
   plural: "Employments"
-  extends: Interest
+  extends:
+    - Interest
   matchable: false
   featured:
     - employer
@@ -19,7 +20,8 @@ Employment:
     label: "works for"
     target: employer
     directed: true
-    caption: role
+    caption:
+      - role
   properties:
     employer:
       label: "Employer"

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Family.yaml

@@ -2,7 +2,8 @@ Family:
   label: "Family"
   plural: "Family members"
   description: "Family relationship between two people"
-  extends: Interval
+  extends:
+    - Interval
   matchable: false
   featured:
     - person
@@ -16,7 +17,8 @@ Family:
     label: "related to"
     target: relative
     directed: false
-    caption: relationship
+    caption:
+      - relationship
   properties:
     person:
       label: "Person"

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Folder.yaml

@@ -1,5 +1,6 @@
 Folder:
-  extends: Document
+  extends:
+    - Document
   label: Folder
   plural: Folders
   matchable: false

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/HyperText.yaml

@@ -1,6 +1,7 @@
 HyperText:
   # HTML document
-  extends: Document
+  extends:
+    - Document
   label: Web page
   plural: Web pages
   matchable: false

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Identification.yaml

@@ -4,7 +4,8 @@ Identification:
   description: >
     An form of identification associated with its holder and some issuing country. This
     can be used for national ID cards, voter enrollments and similar instruments.
-  extends: Interval
+  extends:
+    - Interval
   matchable: false
   featured:
     - number

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Image.yaml

@@ -1,5 +1,6 @@
 Image:
-  extends: Document
+  extends:
+    - Document
   label: Image
   plural: Images
   description: >

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Interest.yaml

@@ -1,6 +1,7 @@
 Interest:
   label: "Interest"
-  extends: Interval
+  extends:
+    - Interval
   matchable: false
   abstract: true
   properties:

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/LegalEntity.yaml

@@ -1,5 +1,6 @@
 LegalEntity:
-  extends: Thing
+  extends:
+    - Thing
   label: Legal entity
   plural: Legal entities
   description: >

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Membership.yaml

@@ -1,7 +1,8 @@
 Membership:
   label: "Membership"
   plural: "Memberships"
-  extends: Interest
+  extends:
+    - Interest
   matchable: false
   featured:
     - member
@@ -19,7 +20,8 @@ Membership:
     label: "belongs to"
     target: organization
     directed: true
-    caption: role
+    caption:
+      - role
   properties:
     member:
       label: "Member"

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Occupancy.yaml

@@ -1,7 +1,8 @@
 Occupancy:
   label: "Occupancy"
   plural: "Occupancies"
-  extends: Interval
+  extends:
+    - Interval
   matchable: false
   description: >
     The occupation of a position by a person for a specific period of time.

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Organization.yaml

@@ -1,10 +1,11 @@
 Organization:
-  extends: LegalEntity
+  extends:
+    - LegalEntity
   label: Organization
   plural: Organizations
   description: >
     Any type of incorporated entity that cannot be owned by another (see Company). This
-    might include charities, foundations or state-owned enterprises, depending on their 
+    might include charities, foundations or state-owned enterprises, depending on their
     jurisdiction.
   matchable: true
   featured:

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Ownership.yaml

@@ -1,7 +1,8 @@
 Ownership:
   label: "Ownership"
   plural: "Ownerships"
-  extends: Interest
+  extends:
+    - Interest
   matchable: false
   featured:
     - owner
@@ -17,7 +18,8 @@ Ownership:
     label: "owns"
     target: asset
     directed: true
-    caption: percentage
+    caption:
+      - percentage
   properties:
     owner:
       label: "Owner"

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Package.yaml

@@ -1,5 +1,6 @@
 Package:
-  extends: Folder
+  extends:
+    - Folder
   label: Package
   plural: Packages
   description: >

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Pages.yaml

@@ -1,5 +1,6 @@
 Pages:
-  extends: Document
+  extends:
+    - Document
   label: Document
   description: >
     A multi-page document, such as a PDF or Word file or slide-show presentation.

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Passport.yaml

@@ -3,7 +3,8 @@ Passport:
   plural: "Passports"
   description: >
     An passport held by a person.
-  extends: Identification
+  extends:
+    - Identification
   matchable: false
   featured:
     - passportNumber

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Person.yaml

@@ -1,5 +1,6 @@
 Person:
-  extends: LegalEntity
+  extends:
+    - LegalEntity
   label: Person
   plural: People
   description: >
@@ -79,6 +80,18 @@ Person:
       type: gender
     ethnicity:
       label: Ethnicity
+    height:
+      label: Height
+      type: number
+    weight:
+      label: Weight
+      type: number
+    eyeColor:
+      label: Eye color
+    hairColor:
+      label: Hair color
+    appearance:
+      label: Physical appearance
     religion:
       label: Religion
     political:

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/PlainText.yaml

@@ -1,5 +1,6 @@
 PlainText:
-  extends: Document
+  extends:
+    - Document
   label: Text file
   plural: Text files
   description: >

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Position.yaml

@@ -1,13 +1,14 @@
 Position:
   label: "Position"
   plural: "Positions"
-  extends: Thing
+  extends:
+    - Thing
   matchable: true
   # cf. https://www.popoloproject.com/specs/post.html
   description: >
     A post, role or position within an organization or body.
     This describes a position one or more people may occupy
-    and not the occupation of the post by a specific individual at a 
+    and not the occupation of the post by a specific individual at a
     specific point in time.
 
     'subnationalArea' should be used to further restrict the scope of the

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Post.yaml

@@ -1,14 +1,15 @@
 Post:
   label: "Post"
   plural: "Posts"
-  extends: Interest
+  extends:
+    - Interest
   matchable: false
   deprecated: true
   # cf. https://www.popoloproject.com/specs/post.html
   # But they're using it to define the post as an abstract thing, this
   # describes the interval in which it is held by an individual.
   description: >
-    A post, role or position held by an individual within an organization 
+    A post, role or position held by an individual within an organization
     or body. This describes the period for which the position is held,
     not the abstract concept of the post.
   featured:

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Project.yaml

@@ -24,4 +24,4 @@ Project:
     phase:
       label: "Phase"
     goal:
-      label: "Project goal"
+      label: "Project goal"

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/ProjectParticipant.yaml

@@ -1,7 +1,8 @@
 ProjectParticipant:
   label: Project participant
   plural: Project participants
-  extends: Interest
+  extends:
+    - Interest
   description: >
     An activity carried out by a group of participants.
   matchable: false
@@ -16,7 +17,8 @@ ProjectParticipant:
     label: "participates in"
     target: project
     directed: true
-    caption: role
+    caption:
+      - role
   properties:
     project:
       label: "Project"

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/PublicBody.yaml

@@ -3,7 +3,8 @@ PublicBody:
   plural: Public bodies
   description: >
     A public body, such as a ministry, department or state company.
-  extends: Organization
+  extends:
+    - Organization
   matchable: true
   featured:
     - name

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/RealEstate.yaml

@@ -1,5 +1,6 @@
 RealEstate:
-  extends: Asset
+  extends:
+    - Asset
   label: Real estate
   plural: Real estates
   description: "A piece of land or property."

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Representation.yaml

@@ -2,7 +2,8 @@ Representation:
   label: "Representation"
   plural: "Representations"
   description: "A mediatory, intermediary, middleman, or broker acting on behalf of a legal entity."
-  extends: Interest
+  extends:
+    - Interest
   matchable: false
   featured:
     - agent
@@ -16,7 +17,8 @@ Representation:
     label: "represents"
     target: client
     directed: true
-    caption: role
+    caption:
+      - role
   properties:
     agent: # aka representative / incorporation agent
       label: "Agent"

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Sanction.yaml

@@ -2,7 +2,8 @@ Sanction:
   label: Sanction
   plural: Sanctions
   description: "A sanction designation"
-  extends: Interval
+  extends:
+    - Interval
   matchable: false
   featured:
     - entity

{followthemoney-3.6.3 → followthemoney-3.7.0}/followthemoney/schema/Security.yaml

@@ -1,5 +1,6 @@
 Security:
-  extends: Asset
+  extends:
+    - Asset
   label: Security
   plural: Securities
   description: "A tradeable financial asset."