More robust email and urls #4 #10

Author: lolipopshock

src/notion_df/configs.py

@@ -23,6 +23,7 @@
 from notion_df.utils import (
     flatten_dict,
     IDENTITY_TRANSFORM,
+    REMOVE_EMPTY_STR_TRANSFORM,
     SECURE_STR_TRANSFORM,
     SECURE_BOOL_TRANSFORM,
     SECURE_TIME_TRANSFORM,
@@ -233,10 +234,10 @@ def parse_single_config(data: Dict) -> BasePropertyConfig:
     # We assume the users will use the correct type and we don't need to perform any transformation
     "people": IDENTITY_TRANSFORM,
     "relation": IDENTITY_TRANSFORM,
+    "url": REMOVE_EMPTY_STR_TRANSFORM,
+    "email": REMOVE_EMPTY_STR_TRANSFORM,
     ### TODO: check the following ###
     "files": SECURE_STR_TRANSFORM,
-    "url": SECURE_STR_TRANSFORM,
-    "email": SECURE_STR_TRANSFORM,
     "phone_number": SECURE_STR_TRANSFORM,
     "formula": SECURE_STR_TRANSFORM,
     "rollup": SECURE_STR_TRANSFORM,

src/notion_df/utils.py

@@ -57,5 +57,6 @@ def transform_time(s:Any) -> str:
 
 IDENTITY_TRANSFORM = lambda ele: ele
 SECURE_STR_TRANSFORM = lambda ele: str(ele) if not is_item_empty(ele) else ""
+REMOVE_EMPTY_STR_TRANSFORM = lambda ele: None if ele=="" or ele is None else SECURE_STR_TRANSFORM(ele)
 SECURE_BOOL_TRANSFORM = lambda ele: bool(ele) if not is_item_empty(ele) else None
 SECURE_TIME_TRANSFORM = transform_time

src/notion_df/values.py

@@ -131,15 +131,15 @@ def value(self) -> List[str]:
     @classmethod
     def from_value(cls, values: Union[List[str], str]):
         if isinstance(values, list):
-            return cls(
-                relation=[RelationObject.from_value(value) for value in values]
-            )
+            return cls(relation=[RelationObject.from_value(value) for value in values])
         else:
             return cls(relation=[RelationObject.from_value(values)])
 
+
 class RollUpValues(BasePropertyValues):
     pass
 
+
 class PeopleValues(BasePropertyValues):
     people: List[UserObject]
 
@@ -150,12 +150,11 @@ def value(self) -> List[str]:
     @classmethod
     def from_value(cls, values: Union[List[str], str]):
         if isinstance(values, list):
-            return cls(
-                people=[UserObject.from_value(value) for value in values]
-            )
+            return cls(people=[UserObject.from_value(value) for value in values])
         else:
             return cls(people=[UserObject.from_value(values)])
 
+
 class FileValues(BasePropertyValues):
     pass
 
@@ -180,9 +179,16 @@ def value(self) -> Optional[str]:
         return self.url
 
     @classmethod
-    def from_value(cls, value: str):
+    def from_value(cls, value: Optional[str]):
         return cls(url=value)
 
+    def query_dict(self):
+        res = flatten_dict(self.dict())
+        if "url" not in res:
+            res["url"] = None 
+            # The url value is required by the notion API
+        return res
+
 
 class EmailValues(BasePropertyValues):
     email: Optional[str]
@@ -277,6 +283,13 @@ def _is_item_empty(item):
     return isna
 
 
+RESERVED_VALUES = ["url"]
+
+
+def _is_reserved_value(key, schema):
+    return schema[key].type in RESERVED_VALUES
+
+
 def parse_value_with_schema(
     idx: int, key: str, value: Any, schema: "DatabaseSchema"
 ) -> BasePropertyValues:
@@ -333,7 +346,7 @@ def from_series(
             {
                 key: parse_value_with_schema(idx, key, val, schema)
                 for idx, (key, val) in enumerate(series.items())
-                if not _is_item_empty(val)
+                if not _is_item_empty(val) or _is_reserved_value(key, schema)
             }
         )