type, lint, test fixes

Author: exrhizo

graphistry/Plottable.py

@@ -790,4 +790,3 @@ def transform_umap(self, df: pd.DataFrame,
                     umap_transform_kwargs: Dict[str, Any] = {}
     ) -> Union[Tuple[pd.DataFrame, pd.DataFrame, pd.DataFrame], 'Plottable']:
         ...
-

graphistry/PlotterBase.py

@@ -1693,10 +1693,10 @@ def plot(
             assert uploader is not None
             if skip_upload:
                 return uploader
-            uploader.token = self._session.api_token # type: ignore[assignment]
+            uploader.token = self._session.api_token  # type: ignore[assignment]
             uploader.post(as_files=as_files, memoize=memoize, validate=validate, erase_files_on_fail=erase_files_on_fail)
             uploader.maybe_post_share_link(self)
-            info: DatasetInfo = {
+            info = {
                 'name': uploader.dataset_id,
                 'type': 'arrow',
                 'viztoken': str(uuid.uuid4())

graphistry/arrow_uploader.py

@@ -331,7 +331,7 @@ def sso_login(self, org_name: Optional[str] = None, idp_name: Optional[str] = No
             logger.debug("@ArrowUploader.sso_login, out.text: %s", out.text)
             json_response = out.json()
             logger.debug("@ArrowUploader.sso_login, json_response: %s", json_response)
-            self.token = None # type: ignore[assignment]
+            self.token = None  # type: ignore[assignment]
             if not ('status' in json_response):
                 raise Exception(out.text)
             else:

graphistry/client_session.py

@@ -56,7 +56,7 @@ def __init__(self) -> None:
         self.personal_key_secret: Optional[str] = None
 
         # NOTE: Still used as a global, perhaps use a session pattern
-        self.encode_textual_batch_size: Optional[int] = None # encode_textual.batch_size
+        self.encode_textual_batch_size: Optional[int] = None  # encode_textual.batch_size
 
         # TODO: Migrate to a pattern like Kusto or Spanner
         self.bolt_driver: Optional[Any] = None
@@ -87,6 +87,9 @@ def _viz_url(self, info: DatasetInfo, url_params: Dict[str, Any]) -> str:
 
     def certificate_validation(self, value: Optional[bool] = None) -> bool:
         ...
+    
+    def api_token(self, value: Optional[str] = None) -> Optional[str]:
+        ...
 
 
 @deprecated("Use the session pattern instead")
@@ -98,9 +101,11 @@ def use_global_session() -> ClientSession:
 T = TypeVar("T")
 
 @overload
-def get_from_env(name: str, expected_type: Type[T]) -> Optional[T]: ...
+def get_from_env(name: str, expected_type: Type[T]) -> Optional[T]:
+    ...
 @overload  # when a *non-None* default is supplied, return is not Optional
-def get_from_env(name: str, expected_type: Type[T], default: T) -> T: ...
+def get_from_env(name: str, expected_type: Type[T], default: T) -> T:
+    ...
 
 def get_from_env(
     name: str,

graphistry/plugins/kustograph.py

@@ -32,7 +32,7 @@ def __init__(
         # NOTE: Cooperative Mixin initialization passes args and kwargs along
         super().__init__(*args, **kwargs)
 
-        session = kwargs.get('pygraphistry_session', {}).get('_session', None)
+        session = getattr(kwargs.get('pygraphistry_session', {}), '_session', None)
         self._kusto_session = session.kusto if isinstance(session, ClientSession) else KustoSession()
 
     def from_kusto_client(self, client: KustoClient, database: str) -> 'KustoGraph':
@@ -65,7 +65,7 @@ def kusto_connect(self, config: Optional[KustoConfig] = None) -> 'KustoGraph':
             self._kusto_session.client = None
             self._kusto_session.database = None
 
-        _ = self.kusto_client # trigger initialization
+        _ = self.kusto_client  # trigger initialization
         return self
 
     @property

graphistry/plugins/spannergraph.py

@@ -37,7 +37,7 @@ def __init__(
         # NOTE: Cooperative Mixin initialization passes args and kwargs along
         super().__init__(*args, **kwargs)
 
-        session = kwargs.get('pygraphistry_session', {}).get('_session', None)
+        session = getattr(kwargs.get('pygraphistry_session', {}), '_session', None)
         self._spanner_session = session.spanner if isinstance(session, ClientSession) else SpannerSession()
 
     def from_spanner_client(self, client: Connection, database: str) -> "SpannerGraph":
@@ -52,7 +52,7 @@ def spanner_connect(self, config: Optional[SpannerConfig] = None) -> "SpannerGra
             self._spanner_session.client = None
             self._spanner_session.database = None
 
-        _ = self.spanner_client # trigger initialization
+        _ = self.spanner_client  # trigger initialization
         return self
 
     @property

graphistry/pygraphistry.py

@@ -39,7 +39,7 @@
 
 _client_mode_enabled = False
 _is_client_mode_warned = False
-PyGraphistry: "SessionManagerProtocol" = None # type: ignore[assignment]
+PyGraphistry: "PyGraphistrySession" = None  # type: ignore[assignment]
 
 
 class PyGraphistrySession(SessionManagerProtocol):
@@ -353,6 +353,7 @@ def refresh(self, token: Optional[str] = None, fail_silent: bool = False) -> Opt
             if not fail_silent:
                 util.error("Failed to refresh token: %s" % str(e))
                 raise e
+            return None
 
     def verify_token(self, token: Optional[str] = None, fail_silent: bool = False) -> bool:
         """Return True iff current or provided token is still valid"""
@@ -2171,7 +2172,7 @@ def _viz_url(self, info: DatasetInfo, url_params: Dict[str, Any]) -> str:
             info["name"],
             info["type"],
             info["viztoken"],
-            self._tag,
+            self._session._tag,
             splash_time,
             extra,
         )

graphistry/tests/test_umap_utils.py

@@ -6,11 +6,11 @@
 
 import gc
 import graphistry
+from graphistry.pygraphistry import PyGraphistry
 import os
 import logging
 import numpy as np
 import pandas as pd
-from graphistry.config import config
 from graphistry.feature_utils import remove_internal_namespace_if_present
 from graphistry.tests.test_feature_utils import (
     ndf_reddit,
@@ -737,11 +737,11 @@ def setup_method(self, method: Any) -> None:
 
     @classmethod
     def setup_class(cls: Any) -> None:
-        config.set('encode_textual.batch_size', 8)
+        PyGraphistry._session.encode_textual_batch_size = 8
 
     @classmethod
     def teardown_class(cls: Any) -> None:
-        config.unset('encode_textual.batch_size')
+        PyGraphistry._session.encode_textual_batch_size = None
 
     @pytest.mark.skipif(
         not has_dependancy or not has_cuml,