Push to v0.0.4 including renamed Source

Author: eliasgruenewald

python-tilt-example.ipynb

@@ -128,8 +128,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "<tilt.tilt.Meta object at 0x10e7021f0>\n",
-      "{'_hash': 'bd8f3c314b73d85175c8ccf15b4b8d26348beca96c9df39ba98fa5dda3f60fcc', '_id': '<your-id-01>', 'created': '2020-10-02T22:08:12.510696', 'language': 'en', 'modified': '2020-07-28T22:28:49.794345', 'name': 'Green Compancy SE', 'status': 'active', 'url': 'https://greencompany.implementation.cloud', 'version': 42}\n"
+      "<tilt.tilt.Meta object at 0x10efb4fa0>\n",
+      "{'_hash': 'bd8f3c314b73d85175c8ccf15b4b8d26348beca96c9df39ba98fa5dda3f60fcc', '_id': '<your-id-01>', 'created': '2020-10-02T22:08:12.510696', 'language': 'en', 'modified': '2020-07-30T16:34:11.486918', 'name': 'Green Compancy SE', 'status': 'active', 'url': 'https://greencompany.implementation.cloud', 'version': 42}\n"
      ]
     }
    ],
@@ -167,19 +167,19 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
      "ename": "JsonSchemaException",
      "evalue": "data.controller must contain ['name', 'address', 'country', 'representative'] properties",
      "output_type": "error",
      "traceback": [
-      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
-      "\u001b[0;31mJsonSchemaException\u001b[0m                       Traceback (most recent call last)",
-      "\u001b[0;32m<ipython-input-7-ef961cb89b42>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m\u001b[0m\n\u001b[1;32m     27\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     28\u001b[0m \u001b[0;31m# Validate another example\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 29\u001b[0;31m \u001b[0mvalidate_func\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0minstance\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m     30\u001b[0m \u001b[0;31m## JsonSchemaException: data.controller must contain ['name', 'address', 'country', 'representative'] properties\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     31\u001b[0m \u001b[0;31m## => document is invalid\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
-      "\u001b[0;32m<string>\u001b[0m in \u001b[0;36mvalidate_https___github_com_transparency_information_language_schema\u001b[0;34m(data)\u001b[0m\n",
-      "\u001b[0;31mJsonSchemaException\u001b[0m: data.controller must contain ['name', 'address', 'country', 'representative'] properties"
+      "\u001B[0;31m---------------------------------------------------------------------------\u001B[0m",
+      "\u001B[0;31mJsonSchemaException\u001B[0m                       Traceback (most recent call last)",
+      "\u001B[0;32m<ipython-input-5-ef961cb89b42>\u001B[0m in \u001B[0;36m<module>\u001B[0;34m\u001B[0m\n\u001B[1;32m     27\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m     28\u001B[0m \u001B[0;31m# Validate another example\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m---> 29\u001B[0;31m \u001B[0mvalidate_func\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0minstance\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m     30\u001B[0m \u001B[0;31m## JsonSchemaException: data.controller must contain ['name', 'address', 'country', 'representative'] properties\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m     31\u001B[0m \u001B[0;31m## => document is invalid\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n",
+      "\u001B[0;32m<string>\u001B[0m in \u001B[0;36mvalidate_https___github_com_transparency_information_language_schema\u001B[0;34m(data)\u001B[0m\n",
+      "\u001B[0;31mJsonSchemaException\u001B[0m: data.controller must contain ['name', 'address', 'country', 'representative'] properties"
      ]
     }
    ],
@@ -239,4 +239,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}

setup.py

@@ -5,10 +5,10 @@
 
 setuptools.setup(
     name="tilt",
-    version="0.0.3",
+    version="0.0.4",
     author="Elias Grünewald",
     author_email="gruenewald@tu-berlin.de",
-    description="A python language binding for the Transparancy Information Language and Toolkit (TILT)",
+    description="A python language binding for the Transparency Information Language and Toolkit (TILT)",
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/Transparency-Information-Language/python-tilt",

tilt/tilt.py

@@ -991,7 +991,7 @@ def to_dict(self) -> dict:
         return result
 
 
-class TiltSource:
+class Source:
     """This refers to an locally unique ID in an arbitrary but deterministic format."""
     id: str
     """The category the data refer to."""
@@ -1005,12 +1005,12 @@ def __init__(self, id: str, data_category: str, sources: List[SourceSource]) ->
         self.sources = sources
 
     @staticmethod
-    def from_dict(obj: Any) -> 'TiltSource':
+    def from_dict(obj: Any) -> 'Source':
         assert isinstance(obj, dict)
         id = from_str(obj.get("_id"))
         data_category = from_str(obj.get("dataCategory"))
         sources = from_list(SourceSource.from_dict, obj.get("sources"))
-        return TiltSource(id, data_category, sources)
+        return Source(id, data_category, sources)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -1186,11 +1186,11 @@ class Tilt:
     """This duty to provide information is limited to the collection of personal data that does
     not take place from the data subject (Art. 14).
     """
-    sources: List[TiltSource]
+    sources: List[Source]
     """This schema refers to the adequacy decisions of any third country transfers."""
     third_country_transfers: List[ThirdCountryTransferElement]
 
-    def __init__(self, access_and_data_portability: AccessAndDataPortability, automated_decision_making: AutomatedDecisionMaking, changes_of_purpose: List[ChangesOfPurposeElement], controller: Controller, data_disclosed: List[DataDisclosedElement], data_protection_officer: DataProtectionOfficer, meta: Meta, right_to_complain: RightToComplain, right_to_data_portability: RightToDataPortability, right_to_information: RightToInformation, right_to_rectification_or_deletion: RightToRectificationOrDeletion, right_to_withdraw_consent: RightToWithdrawConsent, sources: List[TiltSource], third_country_transfers: List[ThirdCountryTransferElement]) -> None:
+    def __init__(self, access_and_data_portability: AccessAndDataPortability, automated_decision_making: AutomatedDecisionMaking, changes_of_purpose: List[ChangesOfPurposeElement], controller: Controller, data_disclosed: List[DataDisclosedElement], data_protection_officer: DataProtectionOfficer, meta: Meta, right_to_complain: RightToComplain, right_to_data_portability: RightToDataPortability, right_to_information: RightToInformation, right_to_rectification_or_deletion: RightToRectificationOrDeletion, right_to_withdraw_consent: RightToWithdrawConsent, sources: List[Source], third_country_transfers: List[ThirdCountryTransferElement]) -> None:
         self.access_and_data_portability = access_and_data_portability
         self.automated_decision_making = automated_decision_making
         self.changes_of_purpose = changes_of_purpose
@@ -1221,7 +1221,7 @@ def from_dict(obj: Any) -> 'Tilt':
         right_to_information = RightToInformation.from_dict(obj.get("rightToInformation"))
         right_to_rectification_or_deletion = RightToRectificationOrDeletion.from_dict(obj.get("rightToRectificationOrDeletion"))
         right_to_withdraw_consent = RightToWithdrawConsent.from_dict(obj.get("rightToWithdrawConsent"))
-        sources = from_list(TiltSource.from_dict, obj.get("sources"))
+        sources = from_list(Source.from_dict, obj.get("sources"))
         third_country_transfers = from_list(ThirdCountryTransferElement.from_dict, obj.get("thirdCountryTransfers"))
         return Tilt(access_and_data_portability, automated_decision_making, changes_of_purpose, controller, data_disclosed, data_protection_officer, meta, right_to_complain, right_to_data_portability, right_to_information, right_to_rectification_or_deletion, right_to_withdraw_consent, sources, third_country_transfers)
 
@@ -1239,7 +1239,7 @@ def to_dict(self) -> dict:
         result["rightToInformation"] = to_class(RightToInformation, self.right_to_information)
         result["rightToRectificationOrDeletion"] = to_class(RightToRectificationOrDeletion, self.right_to_rectification_or_deletion)
         result["rightToWithdrawConsent"] = to_class(RightToWithdrawConsent, self.right_to_withdraw_consent)
-        result["sources"] = from_list(lambda x: to_class(TiltSource, x), self.sources)
+        result["sources"] = from_list(lambda x: to_class(Source, x), self.sources)
         result["thirdCountryTransfers"] = from_list(lambda x: to_class(ThirdCountryTransferElement, x), self.third_country_transfers)
         return result