Update nq code to use the bundled neptune_api rather than one from PyPI

Author: gabrys

.pre-commit-config.yaml

@@ -1,3 +1,4 @@
+exclude: ^src/neptune_query/generated/
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.3.0

pyproject.toml

@@ -11,11 +11,16 @@ pattern = "default-unprefixed"
 [tool.poetry.dependencies]
 python = "^3.10"
 
-# Base neptune package
-neptune-api = ">=0.26.0,<0.27.0"
 azure-storage-blob = "^12.7.0"
 pandas = ">=1.4.0"
 
+# neptune-api dependencies:
+httpx = { version = ">=0.15.4,<0.28.2", extras = ["http2"] }
+attrs = ">=21.3.0"
+python-dateutil = "^2.8.0"
+PyJWT = "^2.0.0"
+protobuf = ">=4.21.1,<7"
+
 # Optional for default progress update handling
 tqdm = { version = ">=4.66.0" }
 

src/neptune_query/internal/api_utils.py

@@ -22,15 +22,16 @@
 )
 
 import httpx
-from neptune_api import (
+
+from neptune_query.generated.neptune_api import (
     AuthenticatedClient,
     Client,
 )
-from neptune_api.api.backend import get_client_config
-from neptune_api.auth_helpers import exchange_api_key
-from neptune_api.credentials import Credentials
-from neptune_api.models import ClientConfig
-from neptune_api.types import Response
+from neptune_query.generated.neptune_api.api.backend import get_client_config
+from neptune_query.generated.neptune_api.auth_helpers import exchange_api_key
+from neptune_query.generated.neptune_api.credentials import Credentials
+from neptune_query.generated.neptune_api.models import ClientConfig
+from neptune_query.generated.neptune_api.types import Response
 
 from ..exceptions import NeptuneFailedToFetchClientConfig
 from .env import (

src/neptune_query/internal/client.py

@@ -25,8 +25,8 @@
     Tuple,
 )
 
-from neptune_api import AuthenticatedClient
-from neptune_api.credentials import Credentials
+from neptune_query.generated.neptune_api import AuthenticatedClient
+from neptune_query.generated.neptune_api.credentials import Credentials
 
 from .api_utils import (
     create_auth_api_client,

src/neptune_query/internal/composition/attribute_components.py

@@ -19,7 +19,7 @@
     Optional,
 )
 
-from neptune_api.client import AuthenticatedClient
+from neptune_query.generated.neptune_api.client import AuthenticatedClient
 
 from .. import (
     filters,

src/neptune_query/internal/composition/attributes.py

@@ -21,7 +21,7 @@
     Tuple,
 )
 
-from neptune_api.client import AuthenticatedClient
+from neptune_query.generated.neptune_api.client import AuthenticatedClient
 
 from .. import (
     env,

src/neptune_query/internal/composition/fetch_metric_buckets.py

@@ -24,7 +24,8 @@
 
 import numpy as np
 import pandas as pd
-from neptune_api.client import AuthenticatedClient
+
+from neptune_query.generated.neptune_api.client import AuthenticatedClient
 
 from .. import identifiers
 from ..client import get_client

src/neptune_query/internal/composition/fetch_metrics.py

@@ -21,7 +21,8 @@
 )
 
 import pandas as pd
-from neptune_api.client import AuthenticatedClient
+
+from neptune_query.generated.neptune_api.client import AuthenticatedClient
 
 from .. import client as _client
 from .. import identifiers

src/neptune_query/internal/composition/fetch_series.py

@@ -21,7 +21,8 @@
 )
 
 import pandas as pd
-from neptune_api import AuthenticatedClient
+
+from neptune_query.generated.neptune_api import AuthenticatedClient
 
 from .. import identifiers
 from ..client import get_client

src/neptune_query/internal/composition/type_inference.py

@@ -24,7 +24,7 @@
     Union,
 )
 
-from neptune_api.client import AuthenticatedClient
+from neptune_query.generated.neptune_api.client import AuthenticatedClient
 
 from ...exceptions import AttributeTypeInferenceError
 from ...warnings import AttributeWarning