Merge branch 'main' into migrate-js-clients

kb-kerem · kb-kerem · commit b5d31513ca83 · 2024-04-24T17:58:27.000+02:00
diff --git a/.github/workflows/python-build.yml b/.github/workflows/python-build.yml
@@ -23,6 +23,8 @@ jobs:
         with:
           python-version: '3.10'
       - name: Install Python build utilities
-        run: pip install -r requirements/build.txt
+        run: pip install -r requirements/dev.txt
       - name: Build
         run: python -m build
+      - name: Test
+        run: python -m pytest
diff --git a/.github/workflows/python-release.yml b/.github/workflows/python-release.yml
@@ -26,9 +26,11 @@ jobs:
         with:
           python-version: '3.10'
       - name: Install Python build utilities
-        run: pip install -r requirements/build.txt
+        run: pip install -r requirements/dev.txt
       - name: Build
         run: python -m build
+      - name: Test
+        run: python -m pytest
 
   pypi-publish:
     runs-on: ubuntu-latest
diff --git a/README.md b/README.md
@@ -6,3 +6,4 @@ This repository contains the SDKs for Sauce Labs Visual.
 
 - [C#](./visual-dotnet)
 - [Java](./visual-java)
+- [Python](./visual-python)
diff --git a/visual-dotnet/SauceLabs.Visual/BuildFactory.cs b/visual-dotnet/SauceLabs.Visual/BuildFactory.cs
@@ -93,6 +93,11 @@ private static async Task<VisualBuild> FindBuildById(VisualApi api, string build
             try
             {
                 var build = (await api.Build(buildId)).EnsureValidResponse().Result;
+                if (build == null)
+                {
+                    throw new VisualClientException($@"build {buildId} was not found");
+                }
+
                 return new VisualBuild(build.Id, build.Url, build.Mode);
             }
             catch (VisualClientException)
@@ -113,6 +118,11 @@ private static async Task<VisualBuild> FindBuildById(VisualApi api, string build
             try
             {
                 var build = (await api.BuildByCustomId(customId)).EnsureValidResponse().Result;
+                if (build == null)
+                {
+                    throw new VisualClientException($@"build identified by {customId} was not found");
+                }
+
                 return new VisualBuild(build.Id, build.Url, build.Mode);
             }
             catch (VisualClientException)
diff --git a/visual-dotnet/SauceLabs.Visual/SauceLabs.Visual.csproj b/visual-dotnet/SauceLabs.Visual/SauceLabs.Visual.csproj
@@ -7,7 +7,7 @@
     <language>en-US</language>
     <NeutralLanguage>en</NeutralLanguage>
     <PackageId>SauceLabs.Visual</PackageId>
-    <Version>0.3.0</Version>
+    <Version>0.3.1</Version>
     <Title>Sauce Labs Visual Binding</Title>
     <PackageTags>saucelabs sauce labs visual testing screenshot capture dom</PackageTags>
     <RepositoryUrl>https://github.com/saucelabs/visual-sdks</RepositoryUrl>
diff --git a/visual-python/.bumpversion.toml b/visual-python/.bumpversion.toml
@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "0.0.6"
+current_version = "0.0.8"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"
diff --git a/visual-python/README.md b/visual-python/README.md
@@ -1,3 +1,7 @@
 # Sauce Labs Visual for Python
 
 Sauce Labs Visual for Python exposes Sauce Labs Visual Testing for your Python project with Selenium.
+
+## Installation & Usage
+
+View installation and usage instructions on the [Sauce Docs website](https://docs.saucelabs.com/visual-testing/integrations/python/).
diff --git a/visual-python/pyproject.toml b/visual-python/pyproject.toml
@@ -1,11 +1,12 @@
 [project]
 name = "saucelabs_visual"
-version = "0.0.6"
+version = "0.0.8"
 description = "Python bindings for Sauce Labs Visual"
 dependencies=[
     "requests",
     "requests-toolbelt",
     "gql",
+    "tabulate",
 ]
 readme = "README.md"
 
@@ -24,3 +25,9 @@ include = [
 [project.urls]
 Homepage = "https://github.com/saucelabs/visual-sdks/tree/main/visual-python"
 Issues = "https://github.com/saucelabs/visual-sdks/issues"
+
+[tool.pytest.ini_options]
+pythonpath = "src"
+addopts = [
+    "--import-mode=importlib",
+]
diff --git a/visual-python/requirements/dev.txt b/visual-python/requirements/dev.txt
@@ -3,3 +3,5 @@
 -r build.txt
 robotframework==7.0.0
 robotframework-seleniumlibrary==6.2.0
+pytest==8.1.1
+coverage==7.4.4
diff --git a/visual-python/requirements/user.txt b/visual-python/requirements/user.txt
@@ -2,3 +2,4 @@
 gql==3.5.0
 requests>=2.1.0
 requests-toolbelt>=1.0.0
+tabulate>=0.9.0
diff --git a/visual-python/src/saucelabs_visual/client.py b/visual-python/src/saucelabs_visual/client.py
@@ -1,18 +1,22 @@
+from datetime import datetime, timedelta
 from os import environ
+from time import sleep
 from typing import List, Union
 
 from gql import Client, gql
 from gql.transport.requests import RequestsHTTPTransport
 from requests.auth import HTTPBasicAuth
 
 from saucelabs_visual.regions import Region
-from saucelabs_visual.typing import IgnoreRegion, FullPageConfig
+from saucelabs_visual.typing import IgnoreRegion, FullPageConfig, DiffingMethod, BuildStatus
 
 
 class SauceLabsVisual:
     client: Client = None
     build_id: Union[str, None] = None
+    build_url: Union[str, None] = None
     meta_cache: dict = {}
+    region: Region = None
 
     def __init__(self):
         self._create_client()
@@ -27,7 +31,8 @@ def _create_client(self):
                 '`SAUCE_USERNAME` and `SAUCE_ACCESS_KEY` environment variables.'
             )
 
-        region_url = Region.from_name(environ.get("SAUCE_REGION") or 'us-west-1').graphql_endpoint
+        self.region = Region.from_name(environ.get("SAUCE_REGION") or 'us-west-1')
+        region_url = self.region.graphql_endpoint
         transport = RequestsHTTPTransport(url=region_url, auth=HTTPBasicAuth(username, access_key))
         self.client = Client(transport=transport, execute_timeout=90)
 
@@ -36,12 +41,12 @@ def get_client(self) -> Client:
 
     def create_build(
             self,
-            name: str = environ.get('SAUCE_VISUAL_BUILD_NAME') or None,
-            project: str = environ.get('SAUCE_VISUAL_PROJECT') or None,
-            branch: str = environ.get('SAUCE_VISUAL_BRANCH') or None,
-            default_branch: str = environ.get('SAUCE_VISUAL_DEFAULT_BRANCH') or None,
-            custom_id: str = environ.get('SAUCE_VISUAL_CUSTOM_ID') or None,
-            keep_alive_timeout: int = None
+            name: Union[str, None] = environ.get('SAUCE_VISUAL_BUILD_NAME'),
+            project: Union[str, None] = environ.get('SAUCE_VISUAL_PROJECT'),
+            branch: Union[str, None] = environ.get('SAUCE_VISUAL_BRANCH'),
+            default_branch: Union[str, None] = environ.get('SAUCE_VISUAL_DEFAULT_BRANCH'),
+            custom_id: Union[str, None] = environ.get('SAUCE_VISUAL_CUSTOM_ID'),
+            keep_alive_timeout: Union[int, None] = None
     ):
         query = gql(
             # language=GraphQL
@@ -78,6 +83,7 @@ def create_build(
         }
         build = self.client.execute(query, variable_values=values)
         self.build_id = build['createBuild']['id']
+        self.build_url = build['createBuild']['url']
         return build
 
     def finish_build(self):
@@ -95,7 +101,6 @@ def finish_build(self):
         )
         values = {"id": self.build_id}
         self.meta_cache.clear()
-        self.build_id = None
         return self.client.execute(query, variable_values=values)
 
     def get_selenium_metadata(self, session_id: str) -> str:
@@ -137,12 +142,13 @@ def create_snapshot_from_webdriver(
             self,
             name: str,
             session_id: str,
-            test_name: str = None,
-            suite_name: str = None,
+            test_name: Union[str, None] = None,
+            suite_name: Union[str, None] = None,
             capture_dom: bool = False,
-            clip_selector: str = None,
-            ignore_regions: List[IgnoreRegion] = None,
-            full_page_config: FullPageConfig = None,
+            clip_selector: Union[str, None] = None,
+            ignore_regions: Union[List[IgnoreRegion], None] = None,
+            full_page_config: Union[FullPageConfig, None] = None,
+            diffing_method: DiffingMethod = DiffingMethod.SIMPLE,
     ):
         query = gql(
             # language=GraphQL
@@ -158,6 +164,7 @@ def create_snapshot_from_webdriver(
                 $clipSelector: String,
                 $ignoreRegions: [RegionIn!],
                 $fullPageConfig: FullPageConfigIn,
+                $diffingMethod: DiffingMethod,
             ) {
                 createSnapshotFromWebDriver(input: {
                     name: $name,
@@ -170,6 +177,7 @@ def create_snapshot_from_webdriver(
                     clipSelector: $clipSelector,
                     ignoreRegions: $ignoreRegions,
                     fullPageConfig: $fullPageConfig,
+                    diffingMethod: $diffingMethod,
                 }){
                     id
                 }
@@ -191,5 +199,71 @@ def create_snapshot_from_webdriver(
                 "delayAfterScrollMs": full_page_config.get('delay_after_scroll_ms'),
                 "hideAfterFirstScroll": full_page_config.get('hide_after_first_scroll'),
             } if full_page_config is not None else None,
+            "diffingMethod": (diffing_method or DiffingMethod.SIMPLE).value,
         }
         return self.client.execute(query, variable_values=values)
+
+    def get_build_status(
+            self,
+            wait: bool = True,
+            timeout: int = 60,
+    ):
+        query = gql(
+            # language=GraphQL
+            """
+            query buildStatus($buildId: UUID!) {
+                result: build(id: $buildId) {
+                    id
+                    name
+                    url
+                    mode
+                    status
+                    unapprovedCount: diffCountExtended(input: { status: UNAPPROVED })
+                    approvedCount: diffCountExtended(input: { status: APPROVED })
+                    rejectedCount: diffCountExtended(input: { status: REJECTED })
+                    equalCount: diffCountExtended(input: { status: EQUAL })
+                    erroredCount: diffCountExtended(input: { status: ERRORED })
+                    queuedCount: diffCountExtended(input: { status: QUEUED })
+                }
+            }
+            """
+        )
+        values = {
+            "buildId": self.build_id,
+        }
+
+        if not wait:
+            return self.client.execute(query, variable_values=values)
+
+        cutoff_time = datetime.now() + timedelta(seconds=timeout)
+        build = None
+        result = None
+
+        while build is None and datetime.now() < cutoff_time:
+            result = self.client.execute(query, variable_values=values)
+
+            if result['result'] is None:
+                raise ValueError(
+                    'Sauce Visual build has been deleted or you do not have access to view it.'
+                )
+
+            if result['result']['status'] != BuildStatus.RUNNING.value:
+                build = result
+            else:
+                sleep(min(10, timeout))
+
+        # Return the successful build if available, else, the last run
+        return build if build is not None else result
+
+    def get_build_link(self) -> str:
+        """
+        Get the dashboard build link for viewing the current build on Sauce Labs.
+        :return:
+        """
+        return self.build_url
+
+    def get_build_created_link(self) -> str:
+        return f'Sauce Labs Visual build created:\t{self.get_build_link()}'
+
+    def get_build_finished_link(self) -> str:
+        return f'Sauce Labs Visual build finished:\t{self.get_build_link()}'
diff --git a/visual-python/src/saucelabs_visual/frameworks/robot.py b/visual-python/src/saucelabs_visual/frameworks/robot.py
diff --git a/visual-python/src/saucelabs_visual/regions.py b/visual-python/src/saucelabs_visual/regions.py
diff --git a/visual-python/src/saucelabs_visual/typing.py b/visual-python/src/saucelabs_visual/typing.py
diff --git a/visual-python/src/saucelabs_visual/utils.py b/visual-python/src/saucelabs_visual/utils.py
diff --git a/visual-python/tests/test_utils.py b/visual-python/tests/test_utils.py

Original file line number	Diff line number	Diff line change
`@@ -6,3 +6,4 @@ This repository contains the SDKs for Sauce Labs Visual.`
`6`	`6`
`7`	`7`	`- [C#](./visual-dotnet)`
`8`	`8`	`- [Java](./visual-java)`
	`9`	`+- [Python](./visual-python)`
Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,11 @@ private static async Task<VisualBuild> FindBuildById(VisualApi api, string build`
`93`	`93`	`try`
`94`	`94`	`{`
`95`	`95`	`var build = (await api.Build(buildId)).EnsureValidResponse().Result;`
	`96`	`+ if (build == null)`
	`97`	`+ {`
	`98`	`+ throw new VisualClientException($@"build {buildId} was not found");`
	`99`	`+ }`
	`100`	`+`
`96`	`101`	`return new VisualBuild(build.Id, build.Url, build.Mode);`
`97`	`102`	`}`
`98`	`103`	`catch (VisualClientException)`
`@@ -113,6 +118,11 @@ private static async Task<VisualBuild> FindBuildById(VisualApi api, string build`
`113`	`118`	`try`
`114`	`119`	`{`
`115`	`120`	`var build = (await api.BuildByCustomId(customId)).EnsureValidResponse().Result;`
	`121`	`+ if (build == null)`
	`122`	`+ {`
	`123`	`+ throw new VisualClientException($@"build identified by {customId} was not found");`
	`124`	`+ }`
	`125`	`+`
`116`	`126`	`return new VisualBuild(build.Id, build.Url, build.Mode);`
`117`	`127`	`}`
`118`	`128`	`catch (VisualClientException)`