Attempt to move decorated function to new module for Windows

Author: adamtheturtle

src/vws/_wait_for_target_processed.py

@@ -1,31 +1,71 @@
 """
-This is tooling for waiting for a target to be processed.
+Tooling for waiting for a target to be processed.
 
 It lives here rather than in ``vws.py`` to support Windows.
 """
 
+from time import sleep
 from typing import Optional
 
 from wrapt_timeout_decorator import timeout
 
-from vws import VWS
+import vws
 from vws.exceptions import TargetProcessingTimeout
+from vws.reports import TargetStatuses
+
+
+def _wait_for_target_processed(
+    vws_client: 'vws.VWS',
+    target_id: str,
+    seconds_between_requests: float,
+) -> None:
+    """
+    Wait indefinitely for a target to get past the processing stage.
+
+    Args:
+        vws_client: The VWS client to make requests with.
+        target_id: The ID of the target to wait for.
+        seconds_between_requests: The number of seconds to wait between
+            requests made while polling the target status.
+
+    Raises:
+        ~vws.exceptions.AuthenticationFailure: The secret key is not
+            correct.
+        ~vws.exceptions.Fail: There was an error with the request. For
+            example, the given access key does not match a known database.
+        TimeoutError: The target remained in the processing stage for more
+            than five minutes.
+        ~vws.exceptions.UnknownTarget: The given target ID does not match a
+            target in the database.
+        ~vws.exceptions.RequestTimeTooSkewed: There is an error with the
+            time sent to Vuforia.
+    """
+    while True:
+        report = vws_client.get_target_summary_report(target_id=target_id)
+        if report.status != TargetStatuses.PROCESSING:
+            return
+
+        sleep(seconds_between_requests)
 
 
 def foobar(
-    vws_client: VWS,
+    vws_client: 'vws.VWS',
     timeout_seconds: Optional[float],
     seconds_between_requests: float,
     target_id: str,
-):
+) -> None:
+    """
+    Add Windows support.
+    """
 
     @timeout(
         dec_timeout=timeout_seconds,
         timeout_exception=TargetProcessingTimeout,
         use_signals=False,
     )
     def decorated() -> None:
-        vws_client._wait_for_target_processed(
+        _wait_for_target_processed(
+            vws_client=vws_client,
             target_id=target_id,
             seconds_between_requests=seconds_between_requests,
         )

src/vws/vws.py

@@ -6,7 +6,6 @@
 import io
 import json
 from datetime import date
-from time import sleep
 from typing import Dict, List, Optional, Union
 from urllib.parse import urljoin
 
@@ -15,6 +14,7 @@
 from vws_auth_tools import authorization_header, rfc_1123_date
 
 from vws._result_codes import raise_for_result_code
+from vws._wait_for_target_processed import foobar
 from vws.reports import (
     DatabaseSummaryReport,
     TargetRecord,
@@ -253,38 +253,6 @@ def get_target_record(self, target_id: str) -> TargetRecord:
         )
         return target_record
 
-    def _wait_for_target_processed(
-        self,
-        target_id: str,
-        seconds_between_requests: float,
-    ) -> None:
-        """
-        Wait indefinitely for a target to get past the processing stage.
-
-        Args:
-            target_id: The ID of the target to wait for.
-            seconds_between_requests: The number of seconds to wait between
-                requests made while polling the target status.
-
-        Raises:
-            ~vws.exceptions.AuthenticationFailure: The secret key is not
-                correct.
-            ~vws.exceptions.Fail: There was an error with the request. For
-                example, the given access key does not match a known database.
-            TimeoutError: The target remained in the processing stage for more
-                than five minutes.
-            ~vws.exceptions.UnknownTarget: The given target ID does not match a
-                target in the database.
-            ~vws.exceptions.RequestTimeTooSkewed: There is an error with the
-                time sent to Vuforia.
-        """
-        while True:
-            report = self.get_target_summary_report(target_id=target_id)
-            if report.status != TargetStatuses.PROCESSING:
-                return
-
-            sleep(seconds_between_requests)
-
     def wait_for_target_processed(
         self,
         target_id: str,
@@ -318,8 +286,12 @@ def wait_for_target_processed(
             ~vws.exceptions.RequestTimeTooSkewed: There is an error with the
                 time sent to Vuforia.
         """
-        from _wait_for_target_processed import foobar
-        foobar(vws_client=self)
+        foobar(
+            vws_client=self,
+            target_id=target_id,
+            timeout_seconds=timeout_seconds,
+            seconds_between_requests=seconds_between_requests,
+        )
 
     def list_targets(self) -> List[str]:
         """