client temporary fix (#667)

* client handles mis-configured proxy settings on paginated api endpoints

.github/workflows/client-ci.yml

@@ -135,8 +135,10 @@ jobs:
         with:
           python-version: "${{ env.py_ver }}"
 
-      - run: |
-          pip install pytest
-          pip install .
+      - uses: abatilo/actions-poetry@v2
+        with:
+          poetry-version: "${{ env.poetry_ver }}"
+
+      - run: poetry install
 
-      - run: pytest
+      - run: poetry run pytest

.github/workflows/integration-looker-ci.yml

@@ -50,4 +50,5 @@ jobs:
           poetry-version: "${{ env.poetry_ver }}"
 
       - run: poetry install
+
       - run: poetry run pytest

grai-cli/grai_cli/api/server/setup.py

@@ -5,9 +5,9 @@
 import typer
 
 from grai_cli.api.callbacks import requires_config_callback
-from grai_cli.api.entrypoint import app
 from grai_cli.settings.config import config
 from grai_cli.utilities.headers import authenticate
+from grai_cli.utilities.styling import print as print_styled
 
 if TYPE_CHECKING:
     from grai_client.endpoints.client import BaseClient
@@ -31,8 +31,17 @@ def get_default_client() -> BaseClient:
     url = str(config.server.url)
     workspace = config.server.workspace
 
-    client = _clients[config.server.api_version](url=url, workspace=workspace)
-    authenticate(client)
+    try:
+        client = _clients[config.server.api_version](url=url, workspace=workspace)
+        authenticate(client)
+    except:
+        message = (
+            f"Failed to authenticate with the Grai server at `{url}` using the `{workspace}` workspace and"
+            f" provided credentials. Double check your configuration settings are correct. If you're attempting to "
+            f"connect to the cloud instance insure you're using `api.grai.io` not `app.grai.io`. "
+        )
+        print_styled(message)
+        raise typer.Exit()
 
     return client
 

grai-cli/grai_cli/utilities/headers.py

@@ -42,6 +42,7 @@ def authenticate_with_username(client: BaseClient) -> BaseClient:
     Raises:
 
     """
+
     client.authenticate(username=config.auth.username, password=config.auth.password.get_secret_value())
     return client
 

grai-client/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "grai-client"
-version = "0.3.2"
+version = "0.3.3"
 description = ""
 authors = ["Ian Eaves <ian@grai.io>"]
 license = "Elastic-2.0"
@@ -35,6 +35,7 @@ types-pyyaml = "^6.0.12.2"
 pre-commit = "^2.20.0"
 pdoc = "^13.1.1"
 pytest-durations = "^1.2.0"
+toml = "^0.10.2"
 
 [tool.isort]
 profile = "black"
@@ -43,6 +44,10 @@ known_first_party = "grai_client"
 [tool.black]
 line-length = 120
 
+[tool.pytest.ini_options]
+xfail_strict = true
+
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

grai-client/src/grai_client/__init__.py

@@ -8,4 +8,4 @@
     utilities,
 )
 
-__version__ = "0.3.1"
+__version__ = "0.3.3"

grai-client/src/grai_client/endpoints/client.py

@@ -119,6 +119,9 @@ def validate_connection_arguments(
 
     """
 
+    if insecure is not None and not isinstance(insecure, bool):
+        raise ValueError(f"Unexpected `insecure` value: {insecure}, `insecure` must be either " f"True, False or None.")
+
     if url is not None:
         # derive from url
         parsed_url = furl(url)

grai-client/src/grai_client/endpoints/utilities.py

@@ -107,6 +107,7 @@ def response_status_check(resp: Response) -> Response:
             "If you think this should not be the case it might be a bug, you can "
             "submit a bug report at https://github.com/grai-io/grai-core/issues"
         )
+
     raise RequestException(message)
 
 
@@ -154,17 +155,24 @@ def inner(client: "BaseClient", url: str, options: "ClientOptions") -> List[Dict
             url:
             options:
         """
+
         if page := options.pagination.get("page", False):
             return fn(client, page, options).json()["results"]
 
+        # Temporary fix for pagination to deal with poorly configured proxy headers
+
         results = []
         page = url
+        secure = url.startswith("https")
         while page:
             resp = fn(client, page, options).json()
 
             results.extend(resp["results"])
             page = resp["next"]
 
+            if page and page.startswith("http") and secure:
+                page = f"https{page[4:]}"
+
         return results
 
     return inner

grai-client/src/grai_client/endpoints/v1/get/node.py

@@ -36,6 +36,7 @@ def get_node_by_label_v1(
     """
     url = client.get_url(grai_type)
     resp = paginated_get(client, url, options)
+
     return [node_builder(obj) for obj in resp]
 
 

grai-client/tests/test_project_config.py

@@ -0,0 +1,12 @@
+import os
+
+import toml
+
+from grai_client import __version__
+
+
+def test_correct_version():
+    toml_file = os.path.join(os.path.dirname(__file__), "../pyproject.toml")
+    pyproject = toml.load(toml_file)
+    version = pyproject["tool"]["poetry"]["version"]
+    assert version == __version__