Merge pull request #66 from ronaldheft/arrow-1.0-support

Fixes #62: Sleep data / arrow 1.0 support

Author: vangorra

poetry.lock

@@ -22,7 +22,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.dependencies]
 python = "^3.6 || ^3.7"
-arrow = "0.17.0"
+arrow = ">=1.0.3"
 requests-oauth = ">=0.4.1"
 requests-oauthlib = ">=1.2"
 typing-extensions = ">=3.7.4.2"

pyproject.toml

@@ -71,15 +71,15 @@ def test_maybe_update_credentials() -> None:
 
     creds1: Final = Credentials(
         access_token="my_access_token",
-        token_expiry=arrow.get("2020-01-01T00:00:00+07:00").timestamp,
+        token_expiry=arrow.get("2020-01-01T00:00:00+07:00").int_timestamp,
         token_type="Bearer",
         refresh_token="my_refresh_token",
         userid=1,
         client_id="CLIENT_ID",
         consumer_secret="CONSUMER_SECRET",
     )
 
-    expires_in = creds1.token_expiry - arrow.utcnow().timestamp
+    expires_in = creds1.token_expiry - arrow.utcnow().int_timestamp
     creds2: Final = Credentials2(
         access_token="my_access_token",
         expires_in=expires_in,

tests/test_common.py

@@ -148,7 +148,7 @@ def test_authorize() -> None:
     assert creds.client_id == client_id
     assert creds.consumer_secret == consumer_secret
     assert creds.expires_in == 11
-    assert creds.token_expiry == arrow.utcnow().timestamp + 11
+    assert creds.token_expiry == arrow.utcnow().int_timestamp + 11
 
 
 @responses.activate

tests/test_init.py

@@ -92,10 +92,10 @@ def user_get_device(self) -> UserGetDeviceResponse:
     def measure_get_activity(
         self,
         data_fields: Iterable[GetActivityField] = GetActivityField,
-        startdateymd: Optional[DateType] = None,
-        enddateymd: Optional[DateType] = None,
+        startdateymd: Optional[DateType] = arrow.utcnow(),
+        enddateymd: Optional[DateType] = arrow.utcnow(),
         offset: Optional[int] = None,
-        lastupdate: Optional[DateType] = None,
+        lastupdate: Optional[DateType] = arrow.utcnow(),
     ) -> MeasureGetActivityResponse:
         """Get user created activities."""
         params: Final[ParamsType] = {}
@@ -120,7 +120,7 @@ def measure_get_activity(
             lambda fields: ",".join([field.value for field in fields]),
         )
         update_params(
-            params, "lastupdate", lastupdate, lambda val: arrow.get(val).timestamp
+            params, "lastupdate", lastupdate, lambda val: arrow.get(val).int_timestamp
         )
         update_params(params, "action", "getactivity")
 
@@ -132,23 +132,25 @@ def measure_get_meas(
         self,
         meastype: Optional[MeasureType] = None,
         category: Optional[MeasureGetMeasGroupCategory] = None,
-        startdate: Optional[DateType] = None,
-        enddate: Optional[DateType] = None,
+        startdate: Optional[DateType] = arrow.utcnow(),
+        enddate: Optional[DateType] = arrow.utcnow(),
         offset: Optional[int] = None,
-        lastupdate: Optional[DateType] = None,
+        lastupdate: Optional[DateType] = arrow.utcnow(),
     ) -> MeasureGetMeasResponse:
         """Get measures."""
         params: Final[ParamsType] = {}
 
         update_params(params, "meastype", meastype, lambda val: val.value)
         update_params(params, "category", category, lambda val: val.value)
         update_params(
-            params, "startdate", startdate, lambda val: arrow.get(val).timestamp
+            params, "startdate", startdate, lambda val: arrow.get(val).int_timestamp
+        )
+        update_params(
+            params, "enddate", enddate, lambda val: arrow.get(val).int_timestamp
         )
-        update_params(params, "enddate", enddate, lambda val: arrow.get(val).timestamp)
         update_params(params, "offset", offset)
         update_params(
-            params, "lastupdate", lastupdate, lambda val: arrow.get(val).timestamp
+            params, "lastupdate", lastupdate, lambda val: arrow.get(val).int_timestamp
         )
         update_params(params, "action", "getmeas")
 
@@ -159,16 +161,18 @@ def measure_get_meas(
     def sleep_get(
         self,
         data_fields: Iterable[GetSleepField],
-        startdate: Optional[DateType] = None,
-        enddate: Optional[DateType] = None,
+        startdate: Optional[DateType] = arrow.utcnow(),
+        enddate: Optional[DateType] = arrow.utcnow(),
     ) -> SleepGetResponse:
         """Get sleep data."""
         params: Final[ParamsType] = {}
 
         update_params(
-            params, "startdate", startdate, lambda val: arrow.get(val).timestamp
+            params, "startdate", startdate, lambda val: arrow.get(val).int_timestamp
+        )
+        update_params(
+            params, "enddate", enddate, lambda val: arrow.get(val).int_timestamp
         )
-        update_params(params, "enddate", enddate, lambda val: arrow.get(val).timestamp)
         update_params(
             params,
             "data_fields",
@@ -182,10 +186,10 @@ def sleep_get(
     def sleep_get_summary(
         self,
         data_fields: Iterable[GetSleepSummaryField],
-        startdateymd: Optional[DateType] = None,
-        enddateymd: Optional[DateType] = None,
+        startdateymd: Optional[DateType] = arrow.utcnow(),
+        enddateymd: Optional[DateType] = arrow.utcnow(),
         offset: Optional[int] = None,
-        lastupdate: Optional[DateType] = None,
+        lastupdate: Optional[DateType] = arrow.utcnow(),
     ) -> SleepGetSummaryResponse:
         """Get sleep summary."""
         params: Final[ParamsType] = {}
@@ -210,7 +214,7 @@ def sleep_get_summary(
         )
         update_params(params, "offset", offset)
         update_params(
-            params, "lastupdate", lastupdate, lambda val: arrow.get(val).timestamp
+            params, "lastupdate", lastupdate, lambda val: arrow.get(val).int_timestamp
         )
         update_params(params, "action", "getsummary")
 
@@ -229,18 +233,18 @@ def heart_get(self, signalid: int) -> HeartGetResponse:
 
     def heart_list(
         self,
-        startdate: Optional[DateType] = None,
-        enddate: Optional[DateType] = None,
+        startdate: Optional[DateType] = arrow.utcnow(),
+        enddate: Optional[DateType] = arrow.utcnow(),
         offset: Optional[int] = None,
     ) -> HeartListResponse:
         """Get heart list."""
         params: Final[ParamsType] = {}
 
         update_params(
-            params, "startdate", startdate, lambda val: arrow.get(val).timestamp,
+            params, "startdate", startdate, lambda val: arrow.get(val).int_timestamp,
         )
         update_params(
-            params, "enddate", enddate, lambda val: arrow.get(val).timestamp,
+            params, "enddate", enddate, lambda val: arrow.get(val).int_timestamp,
         )
         update_params(params, "offset", offset)
         update_params(params, "action", "list")

withings_api/__init__.py

@@ -79,7 +79,7 @@ def validate(cls, value: Any) -> tzinfo:
         raise TypeError("string or tzinfo required")
 
 
-class ArrowType(Arrow):  # type: ignore
+class ArrowType(Arrow):
     """Subclass of Arrow for parsing dates."""
 
     @classmethod
@@ -605,7 +605,7 @@ class Credentials2(ConfiguredBaseModel):
     @property
     def token_expiry(self) -> int:
         """Get the token expiry."""
-        return cast(int, self.created.shift(seconds=self.expires_in).timestamp)
+        return cast(int, self.created.shift(seconds=self.expires_in).int_timestamp)
 
 
 CredentialsType = Union[Credentials, Credentials2]
@@ -624,7 +624,7 @@ def maybe_upgrade_credentials(value: CredentialsType) -> Credentials2:
         userid=creds.userid,
         client_id=creds.client_id,
         consumer_secret=creds.consumer_secret,
-        expires_in=creds.token_expiry - arrow.utcnow().timestamp,
+        expires_in=creds.token_expiry - arrow.utcnow().int_timestamp,
     )