fix: change package and path in protobuf model (#43)

* fix: package change

* fix: wrong import

* fix: prefer direct path to pb files in script

---------

Co-authored-by: Michał Sośnicki <michal.sosnicki@neptune.ai>

Author: michalsosn

.pre-commit-config.yaml

@@ -33,6 +33,6 @@ repos:
           - grpcio-tools
           - types-Pygments
           - types-protobuf
-exclude: "^src/neptune_api/proto/"
+exclude: "^src/(neptune_api|neptune_retrieval_api)/proto/"
 default_language_version:
     python: python3

pyproject.toml

@@ -84,7 +84,7 @@ exclude = ["src/neptune_api/proto", "src/neptune_retrieval_api/proto"]
 select = ["F", "UP"]
 
 [tool.mypy]
-files = 'src/neptune_api'
+files = ['src/neptune_api', 'src/neptune_retrieval_api']
 mypy_path = "stubs"
 install_types = "True"
 non_interactive = "True"

scripts/generate_proto.sh

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+set -euxo pipefail
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+SRC_DIR="${SCRIPT_DIR}/../src"
+PROTOBUF_SRC_DIR="${1:-}"
+
+if [ -z "${PROTOBUF_SRC_DIR}" ]; then
+    echo "Usage: $0 <protobuf_src_dir>"
+    exit 1
+fi
+
+python -m grpc_tools.protoc \
+  --python_out="${SRC_DIR}/neptune_api/proto" \
+  --mypy_out="${SRC_DIR}/neptune_api/proto" \
+  --proto_path="${PROTOBUF_SRC_DIR}" \
+  "${PROTOBUF_SRC_DIR}/google_rpc/"*".proto" \
+  "${PROTOBUF_SRC_DIR}/neptune_pb/ingest/v1/"*".proto" \
+  "${PROTOBUF_SRC_DIR}/neptune_pb/ingest/v1/pub/"*".proto"
+
+python -m grpc_tools.protoc \
+  --python_out="${SRC_DIR}/neptune_retrieval_api/proto" \
+  --mypy_out="${SRC_DIR}/neptune_retrieval_api/proto" \
+  --proto_path="${PROTOBUF_SRC_DIR}" \
+  "${PROTOBUF_SRC_DIR}/neptune_pb/api/v1/model/"*".proto"
+
+protol --create-package --in-place \
+  --python-out "${SRC_DIR}/neptune_api/proto" \
+  protoc \
+  --proto-path "${PROTOBUF_SRC_DIR}" \
+  "${PROTOBUF_SRC_DIR}/google_rpc/"*".proto" \
+  "${PROTOBUF_SRC_DIR}/neptune_pb/ingest/v1/"*".proto" \
+  "${PROTOBUF_SRC_DIR}/neptune_pb/ingest/v1/pub/"*".proto"
+
+protol --create-package --in-place \
+  --python-out "${SRC_DIR}/neptune_retrieval_api/proto" \
+  protoc \
+  --proto-path "${PROTOBUF_SRC_DIR}" \
+  "${PROTOBUF_SRC_DIR}/neptune_pb/api/v1/model/"*".proto"

src/neptune_api/proto/__init__.pyi

@@ -1,6 +1,2 @@
-from . import (
-    google_rpc,
-    neptune_pb,
-)
-from . import google_rpc
 from . import neptune_pb
+from . import google_rpc

src/neptune_api/proto/google_rpc/code_pb2.py

@@ -8,8 +8,8 @@
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google_rpc.code_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-    _globals['DESCRIPTOR']._loaded_options = None
+if _descriptor._USE_C_DESCRIPTORS == False:
+    _globals['DESCRIPTOR']._options = None
     _globals['DESCRIPTOR']._serialized_options = b'\n\x0ecom.google.rpcB\tCodeProtoP\x01Z3google.golang.org/genproto/googleapis/rpc/code;code\xa2\x02\x03RPC'
     _globals['_CODE']._serialized_start = 38
     _globals['_CODE']._serialized_end = 349

src/neptune_api/proto/neptune_pb/ingest/v1/__init__.pyi

@@ -1,3 +1,3 @@
-from . import pub
 from . import common_pb2
 from . import ingest_pb2
+from . import pub

src/neptune_retrieval_api/proto/neptune_pb/api/__init__.pyi

@@ -1,4 +1 @@
-from . import (
-    fields_pb2,
-    model,
-)
+from . import v1