From 062aa8af5410015847da585c4226656a2896074e Mon Sep 17 00:00:00 2001
From: Georgiy Eterevskiy <goshik_e@mail.ru>
Date: Mon, 12 Apr 2021 15:09:59 +0300
Subject: [PATCH] Change step `generate`

---
 Makefile                                      |  8 ++-
 ...ctions_client.py => collections_client.py} |  4 +-
 .../__init__.py                               |  0
 .../collections_pb2.py                        | 64 +++++++++----------
 .../collections_pb2_grpc.py                   | 50 +++++++--------
 .../collections.proto                         |  0
 6 files changed, 65 insertions(+), 61 deletions(-)
 rename examples/{contentcollections_client.py => collections_client.py} (79%)
 rename perxis/{contentcollections => collections_perxis}/__init__.py (100%)
 rename perxis/{contentcollections => collections_perxis}/collections_pb2.py (88%)
 rename perxis/{contentcollections => collections_perxis}/collections_pb2_grpc.py (73%)
 rename proto/{contentcollections => collections}/collections.proto (100%)

diff --git a/Makefile b/Makefile
index 5647f27..e084386 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
 .PHONY: clean-pyc clean-build generate clean
 SHELL = bash
 
-PROTO_FILES_DIR=./proto
+SRC_PROTO_FILES_DIR=./proto
+COPIES_PROTO_FILES_DIR=./proto_perxis
 OUTPUT_FILES_DIR=./perxis
 
 help:
@@ -43,7 +44,10 @@ install-requirements:
 	pip install -r build-requirements.txt
 
 generate: clean-proto install-requirements
-	find $(PROTO_FILES_DIR) -name '*.proto' -exec python3 -m grpc_tools.protoc -I${PROTO_FILES_DIR} --python_out=$(OUTPUT_FILES_DIR) --grpc_python_out=$(OUTPUT_FILES_DIR) {} +
+	cp -avR $(SRC_PROTO_FILES_DIR) $(COPIES_PROTO_FILES_DIR)
+	mv $(COPIES_PROTO_FILES_DIR)/collections $(COPIES_PROTO_FILES_DIR)/collections_perxis
+	find $(COPIES_PROTO_FILES_DIR) -name '*.proto' -exec python3 -m grpc_tools.protoc -I${COPIES_PROTO_FILES_DIR} --python_out=$(OUTPUT_FILES_DIR) --grpc_python_out=$(OUTPUT_FILES_DIR) {} +
+	rm -fr $(COPIES_PROTO_FILES_DIR)
 
 dist: clean generate
 	python setup.py sdist
diff --git a/examples/contentcollections_client.py b/examples/collections_client.py
similarity index 79%
rename from examples/contentcollections_client.py
rename to examples/collections_client.py
index d0760c8..b2f5067 100644
--- a/examples/contentcollections_client.py
+++ b/examples/collections_client.py
@@ -4,8 +4,8 @@ import logging
 
 import grpc
 
-from contentcollections.collections_pb2 import GetRequest
-from contentcollections.collections_pb2_grpc import CollectionsStub
+from perxis.collections_perxis.collections_pb2 import GetRequest
+from perxis.collections_perxis.collections_pb2_grpc import CollectionsStub
 
 
 async def main() -> None:
diff --git a/perxis/contentcollections/__init__.py b/perxis/collections_perxis/__init__.py
similarity index 100%
rename from perxis/contentcollections/__init__.py
rename to perxis/collections_perxis/__init__.py
diff --git a/perxis/contentcollections/collections_pb2.py b/perxis/collections_perxis/collections_pb2.py
similarity index 88%
rename from perxis/contentcollections/collections_pb2.py
rename to perxis/collections_perxis/collections_pb2.py
index 2cabc52..0cc8c42 100644
--- a/perxis/contentcollections/collections_pb2.py
+++ b/perxis/collections_perxis/collections_pb2.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: collections/collections.proto
+# source: collections_perxis/collections.proto
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
@@ -16,12 +16,12 @@ from google.protobuf import wrappers_pb2 as google_dot_protobuf_dot_wrappers__pb
 
 
 DESCRIPTOR = _descriptor.FileDescriptor(
-  name='collections/collections.proto',
+  name='collections_perxis/collections.proto',
   package='content.collections',
   syntax='proto3',
   serialized_options=b'Z8github.com/perxteam/perxis/proto/collections;collections',
   create_key=_descriptor._internal_create_key,
-  serialized_pb=b'\n\x1d\x63ollections/collections.proto\x12\x13\x63ontent.collections\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1egoogle/protobuf/wrappers.proto\"x\n\nCollection\x12\n\n\x02id\x18\x01 \x01(\t\x12\x10\n\x08space_id\x18\x02 \x01(\t\x12\x0e\n\x06\x65nv_id\x18\x03 \x01(\t\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x0e\n\x06single\x18\x05 \x01(\x08\x12\x0e\n\x06system\x18\x06 \x01(\x08\x12\x0e\n\x06schema\x18\x07 \x01(\t\"\x86\x01\n\rCreateRequest\x12\x10\n\x08space_id\x18\x01 \x01(\t\x12\x0e\n\x06\x65nv_id\x18\x02 \x01(\t\x12\x15\n\rcollection_id\x18\x03 \x01(\t\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x0e\n\x06single\x18\x05 \x01(\x08\x12\x0e\n\x06system\x18\x06 \x01(\x08\x12\x0e\n\x06schema\x18\x07 \x01(\t\"E\n\x0e\x43reateResponse\x12\x33\n\ncollection\x18\x01 \x01(\x0b\x32\x1f.content.collections.Collection\"E\n\nGetRequest\x12\x10\n\x08space_id\x18\x01 \x01(\t\x12\x0e\n\x06\x65nv_id\x18\x02 \x01(\t\x12\x15\n\rcollection_id\x18\x03 \x01(\t\"B\n\x0bGetResponse\x12\x33\n\ncollection\x18\x01 \x01(\x0b\x32\x1f.content.collections.Collection\"/\n\x0bListRequest\x12\x10\n\x08space_id\x18\x01 \x01(\t\x12\x0e\n\x06\x65nv_id\x18\x02 \x01(\t\"D\n\x0cListResponse\x12\x34\n\x0b\x63ollections\x18\x01 \x03(\x0b\x32\x1f.content.collections.Collection\"\x92\x01\n\rUpdateRequest\x12\x10\n\x08space_id\x18\x01 \x01(\t\x12\x0e\n\x06\x65nv_id\x18\x02 \x01(\t\x12\x15\n\rcollection_id\x18\x03 \x01(\t\x12\x0c\n\x04name\x18\x04 \x01(\t\x12*\n\x06single\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.BoolValue\x12\x0e\n\x06schema\x18\x06 \x01(\t\"H\n\rDeleteRequest\x12\x10\n\x08space_id\x18\x01 \x01(\t\x12\x0e\n\x06\x65nv_id\x18\x02 \x01(\t\x12\x15\n\rcollection_id\x18\x03 \x01(\t2\x8d\x03\n\x0b\x43ollections\x12S\n\x06\x43reate\x12\".content.collections.CreateRequest\x1a#.content.collections.CreateResponse\"\x00\x12J\n\x03Get\x12\x1f.content.collections.GetRequest\x1a .content.collections.GetResponse\"\x00\x12M\n\x04List\x12 .content.collections.ListRequest\x1a!.content.collections.ListResponse\"\x00\x12\x46\n\x06Update\x12\".content.collections.UpdateRequest\x1a\x16.google.protobuf.Empty\"\x00\x12\x46\n\x06\x44\x65lete\x12\".content.collections.DeleteRequest\x1a\x16.google.protobuf.Empty\"\x00\x42:Z8github.com/perxteam/perxis/proto/collections;collectionsb\x06proto3'
+  serialized_pb=b'\n$collections_perxis/collections.proto\x12\x13\x63ontent.collections\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1egoogle/protobuf/wrappers.proto\"x\n\nCollection\x12\n\n\x02id\x18\x01 \x01(\t\x12\x10\n\x08space_id\x18\x02 \x01(\t\x12\x0e\n\x06\x65nv_id\x18\x03 \x01(\t\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x0e\n\x06single\x18\x05 \x01(\x08\x12\x0e\n\x06system\x18\x06 \x01(\x08\x12\x0e\n\x06schema\x18\x07 \x01(\t\"\x86\x01\n\rCreateRequest\x12\x10\n\x08space_id\x18\x01 \x01(\t\x12\x0e\n\x06\x65nv_id\x18\x02 \x01(\t\x12\x15\n\rcollection_id\x18\x03 \x01(\t\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x0e\n\x06single\x18\x05 \x01(\x08\x12\x0e\n\x06system\x18\x06 \x01(\x08\x12\x0e\n\x06schema\x18\x07 \x01(\t\"E\n\x0e\x43reateResponse\x12\x33\n\ncollection\x18\x01 \x01(\x0b\x32\x1f.content.collections.Collection\"E\n\nGetRequest\x12\x10\n\x08space_id\x18\x01 \x01(\t\x12\x0e\n\x06\x65nv_id\x18\x02 \x01(\t\x12\x15\n\rcollection_id\x18\x03 \x01(\t\"B\n\x0bGetResponse\x12\x33\n\ncollection\x18\x01 \x01(\x0b\x32\x1f.content.collections.Collection\"/\n\x0bListRequest\x12\x10\n\x08space_id\x18\x01 \x01(\t\x12\x0e\n\x06\x65nv_id\x18\x02 \x01(\t\"D\n\x0cListResponse\x12\x34\n\x0b\x63ollections\x18\x01 \x03(\x0b\x32\x1f.content.collections.Collection\"\x92\x01\n\rUpdateRequest\x12\x10\n\x08space_id\x18\x01 \x01(\t\x12\x0e\n\x06\x65nv_id\x18\x02 \x01(\t\x12\x15\n\rcollection_id\x18\x03 \x01(\t\x12\x0c\n\x04name\x18\x04 \x01(\t\x12*\n\x06single\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.BoolValue\x12\x0e\n\x06schema\x18\x06 \x01(\t\"H\n\rDeleteRequest\x12\x10\n\x08space_id\x18\x01 \x01(\t\x12\x0e\n\x06\x65nv_id\x18\x02 \x01(\t\x12\x15\n\rcollection_id\x18\x03 \x01(\t2\x8d\x03\n\x0b\x43ollections\x12S\n\x06\x43reate\x12\".content.collections.CreateRequest\x1a#.content.collections.CreateResponse\"\x00\x12J\n\x03Get\x12\x1f.content.collections.GetRequest\x1a .content.collections.GetResponse\"\x00\x12M\n\x04List\x12 .content.collections.ListRequest\x1a!.content.collections.ListResponse\"\x00\x12\x46\n\x06Update\x12\".content.collections.UpdateRequest\x1a\x16.google.protobuf.Empty\"\x00\x12\x46\n\x06\x44\x65lete\x12\".content.collections.DeleteRequest\x1a\x16.google.protobuf.Empty\"\x00\x42:Z8github.com/perxteam/perxis/proto/collections;collectionsb\x06proto3'
   ,
   dependencies=[google_dot_protobuf_dot_empty__pb2.DESCRIPTOR,google_dot_protobuf_dot_wrappers__pb2.DESCRIPTOR,])
 
@@ -97,8 +97,8 @@ _COLLECTION = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=115,
-  serialized_end=235,
+  serialized_start=122,
+  serialized_end=242,
 )
 
 
@@ -171,8 +171,8 @@ _CREATEREQUEST = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=238,
-  serialized_end=372,
+  serialized_start=245,
+  serialized_end=379,
 )
 
 
@@ -203,8 +203,8 @@ _CREATERESPONSE = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=374,
-  serialized_end=443,
+  serialized_start=381,
+  serialized_end=450,
 )
 
 
@@ -249,8 +249,8 @@ _GETREQUEST = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=445,
-  serialized_end=514,
+  serialized_start=452,
+  serialized_end=521,
 )
 
 
@@ -281,8 +281,8 @@ _GETRESPONSE = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=516,
-  serialized_end=582,
+  serialized_start=523,
+  serialized_end=589,
 )
 
 
@@ -320,8 +320,8 @@ _LISTREQUEST = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=584,
-  serialized_end=631,
+  serialized_start=591,
+  serialized_end=638,
 )
 
 
@@ -352,8 +352,8 @@ _LISTRESPONSE = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=633,
-  serialized_end=701,
+  serialized_start=640,
+  serialized_end=708,
 )
 
 
@@ -419,8 +419,8 @@ _UPDATEREQUEST = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=704,
-  serialized_end=850,
+  serialized_start=711,
+  serialized_end=857,
 )
 
 
@@ -465,8 +465,8 @@ _DELETEREQUEST = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=852,
-  serialized_end=924,
+  serialized_start=859,
+  serialized_end=931,
 )
 
 _CREATERESPONSE.fields_by_name['collection'].message_type = _COLLECTION
@@ -486,63 +486,63 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
 Collection = _reflection.GeneratedProtocolMessageType('Collection', (_message.Message,), {
   'DESCRIPTOR' : _COLLECTION,
-  '__module__' : 'collections.collections_pb2'
+  '__module__' : 'collections_perxis.collections_pb2'
   # @@protoc_insertion_point(class_scope:content.collections.Collection)
   })
 _sym_db.RegisterMessage(Collection)
 
 CreateRequest = _reflection.GeneratedProtocolMessageType('CreateRequest', (_message.Message,), {
   'DESCRIPTOR' : _CREATEREQUEST,
-  '__module__' : 'collections.collections_pb2'
+  '__module__' : 'collections_perxis.collections_pb2'
   # @@protoc_insertion_point(class_scope:content.collections.CreateRequest)
   })
 _sym_db.RegisterMessage(CreateRequest)
 
 CreateResponse = _reflection.GeneratedProtocolMessageType('CreateResponse', (_message.Message,), {
   'DESCRIPTOR' : _CREATERESPONSE,
-  '__module__' : 'collections.collections_pb2'
+  '__module__' : 'collections_perxis.collections_pb2'
   # @@protoc_insertion_point(class_scope:content.collections.CreateResponse)
   })
 _sym_db.RegisterMessage(CreateResponse)
 
 GetRequest = _reflection.GeneratedProtocolMessageType('GetRequest', (_message.Message,), {
   'DESCRIPTOR' : _GETREQUEST,
-  '__module__' : 'collections.collections_pb2'
+  '__module__' : 'collections_perxis.collections_pb2'
   # @@protoc_insertion_point(class_scope:content.collections.GetRequest)
   })
 _sym_db.RegisterMessage(GetRequest)
 
 GetResponse = _reflection.GeneratedProtocolMessageType('GetResponse', (_message.Message,), {
   'DESCRIPTOR' : _GETRESPONSE,
-  '__module__' : 'collections.collections_pb2'
+  '__module__' : 'collections_perxis.collections_pb2'
   # @@protoc_insertion_point(class_scope:content.collections.GetResponse)
   })
 _sym_db.RegisterMessage(GetResponse)
 
 ListRequest = _reflection.GeneratedProtocolMessageType('ListRequest', (_message.Message,), {
   'DESCRIPTOR' : _LISTREQUEST,
-  '__module__' : 'collections.collections_pb2'
+  '__module__' : 'collections_perxis.collections_pb2'
   # @@protoc_insertion_point(class_scope:content.collections.ListRequest)
   })
 _sym_db.RegisterMessage(ListRequest)
 
 ListResponse = _reflection.GeneratedProtocolMessageType('ListResponse', (_message.Message,), {
   'DESCRIPTOR' : _LISTRESPONSE,
-  '__module__' : 'collections.collections_pb2'
+  '__module__' : 'collections_perxis.collections_pb2'
   # @@protoc_insertion_point(class_scope:content.collections.ListResponse)
   })
 _sym_db.RegisterMessage(ListResponse)
 
 UpdateRequest = _reflection.GeneratedProtocolMessageType('UpdateRequest', (_message.Message,), {
   'DESCRIPTOR' : _UPDATEREQUEST,
-  '__module__' : 'collections.collections_pb2'
+  '__module__' : 'collections_perxis.collections_pb2'
   # @@protoc_insertion_point(class_scope:content.collections.UpdateRequest)
   })
 _sym_db.RegisterMessage(UpdateRequest)
 
 DeleteRequest = _reflection.GeneratedProtocolMessageType('DeleteRequest', (_message.Message,), {
   'DESCRIPTOR' : _DELETEREQUEST,
-  '__module__' : 'collections.collections_pb2'
+  '__module__' : 'collections_perxis.collections_pb2'
   # @@protoc_insertion_point(class_scope:content.collections.DeleteRequest)
   })
 _sym_db.RegisterMessage(DeleteRequest)
@@ -557,8 +557,8 @@ _COLLECTIONS = _descriptor.ServiceDescriptor(
   index=0,
   serialized_options=None,
   create_key=_descriptor._internal_create_key,
-  serialized_start=927,
-  serialized_end=1324,
+  serialized_start=934,
+  serialized_end=1331,
   methods=[
   _descriptor.MethodDescriptor(
     name='Create',
diff --git a/perxis/contentcollections/collections_pb2_grpc.py b/perxis/collections_perxis/collections_pb2_grpc.py
similarity index 73%
rename from perxis/contentcollections/collections_pb2_grpc.py
rename to perxis/collections_perxis/collections_pb2_grpc.py
index d1bb1c4..4888cd1 100644
--- a/perxis/contentcollections/collections_pb2_grpc.py
+++ b/perxis/collections_perxis/collections_pb2_grpc.py
@@ -2,7 +2,7 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-from contentcollections import collections_pb2 as collections_dot_collections__pb2
+from collections_perxis import collections_pb2 as collections__perxis_dot_collections__pb2
 from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
 
 
@@ -17,27 +17,27 @@ class CollectionsStub(object):
         """
         self.Create = channel.unary_unary(
                 '/content.collections.Collections/Create',
-                request_serializer=collections_dot_collections__pb2.CreateRequest.SerializeToString,
-                response_deserializer=collections_dot_collections__pb2.CreateResponse.FromString,
+                request_serializer=collections__perxis_dot_collections__pb2.CreateRequest.SerializeToString,
+                response_deserializer=collections__perxis_dot_collections__pb2.CreateResponse.FromString,
                 )
         self.Get = channel.unary_unary(
                 '/content.collections.Collections/Get',
-                request_serializer=collections_dot_collections__pb2.GetRequest.SerializeToString,
-                response_deserializer=collections_dot_collections__pb2.GetResponse.FromString,
+                request_serializer=collections__perxis_dot_collections__pb2.GetRequest.SerializeToString,
+                response_deserializer=collections__perxis_dot_collections__pb2.GetResponse.FromString,
                 )
         self.List = channel.unary_unary(
                 '/content.collections.Collections/List',
-                request_serializer=collections_dot_collections__pb2.ListRequest.SerializeToString,
-                response_deserializer=collections_dot_collections__pb2.ListResponse.FromString,
+                request_serializer=collections__perxis_dot_collections__pb2.ListRequest.SerializeToString,
+                response_deserializer=collections__perxis_dot_collections__pb2.ListResponse.FromString,
                 )
         self.Update = channel.unary_unary(
                 '/content.collections.Collections/Update',
-                request_serializer=collections_dot_collections__pb2.UpdateRequest.SerializeToString,
+                request_serializer=collections__perxis_dot_collections__pb2.UpdateRequest.SerializeToString,
                 response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 )
         self.Delete = channel.unary_unary(
                 '/content.collections.Collections/Delete',
-                request_serializer=collections_dot_collections__pb2.DeleteRequest.SerializeToString,
+                request_serializer=collections__perxis_dot_collections__pb2.DeleteRequest.SerializeToString,
                 response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 )
 
@@ -80,27 +80,27 @@ def add_CollectionsServicer_to_server(servicer, server):
     rpc_method_handlers = {
             'Create': grpc.unary_unary_rpc_method_handler(
                     servicer.Create,
-                    request_deserializer=collections_dot_collections__pb2.CreateRequest.FromString,
-                    response_serializer=collections_dot_collections__pb2.CreateResponse.SerializeToString,
+                    request_deserializer=collections__perxis_dot_collections__pb2.CreateRequest.FromString,
+                    response_serializer=collections__perxis_dot_collections__pb2.CreateResponse.SerializeToString,
             ),
             'Get': grpc.unary_unary_rpc_method_handler(
                     servicer.Get,
-                    request_deserializer=collections_dot_collections__pb2.GetRequest.FromString,
-                    response_serializer=collections_dot_collections__pb2.GetResponse.SerializeToString,
+                    request_deserializer=collections__perxis_dot_collections__pb2.GetRequest.FromString,
+                    response_serializer=collections__perxis_dot_collections__pb2.GetResponse.SerializeToString,
             ),
             'List': grpc.unary_unary_rpc_method_handler(
                     servicer.List,
-                    request_deserializer=collections_dot_collections__pb2.ListRequest.FromString,
-                    response_serializer=collections_dot_collections__pb2.ListResponse.SerializeToString,
+                    request_deserializer=collections__perxis_dot_collections__pb2.ListRequest.FromString,
+                    response_serializer=collections__perxis_dot_collections__pb2.ListResponse.SerializeToString,
             ),
             'Update': grpc.unary_unary_rpc_method_handler(
                     servicer.Update,
-                    request_deserializer=collections_dot_collections__pb2.UpdateRequest.FromString,
+                    request_deserializer=collections__perxis_dot_collections__pb2.UpdateRequest.FromString,
                     response_serializer=google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString,
             ),
             'Delete': grpc.unary_unary_rpc_method_handler(
                     servicer.Delete,
-                    request_deserializer=collections_dot_collections__pb2.DeleteRequest.FromString,
+                    request_deserializer=collections__perxis_dot_collections__pb2.DeleteRequest.FromString,
                     response_serializer=google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString,
             ),
     }
@@ -125,8 +125,8 @@ class Collections(object):
             timeout=None,
             metadata=None):
         return grpc.experimental.unary_unary(request, target, '/content.collections.Collections/Create',
-            collections_dot_collections__pb2.CreateRequest.SerializeToString,
-            collections_dot_collections__pb2.CreateResponse.FromString,
+            collections__perxis_dot_collections__pb2.CreateRequest.SerializeToString,
+            collections__perxis_dot_collections__pb2.CreateResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
@@ -142,8 +142,8 @@ class Collections(object):
             timeout=None,
             metadata=None):
         return grpc.experimental.unary_unary(request, target, '/content.collections.Collections/Get',
-            collections_dot_collections__pb2.GetRequest.SerializeToString,
-            collections_dot_collections__pb2.GetResponse.FromString,
+            collections__perxis_dot_collections__pb2.GetRequest.SerializeToString,
+            collections__perxis_dot_collections__pb2.GetResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
@@ -159,8 +159,8 @@ class Collections(object):
             timeout=None,
             metadata=None):
         return grpc.experimental.unary_unary(request, target, '/content.collections.Collections/List',
-            collections_dot_collections__pb2.ListRequest.SerializeToString,
-            collections_dot_collections__pb2.ListResponse.FromString,
+            collections__perxis_dot_collections__pb2.ListRequest.SerializeToString,
+            collections__perxis_dot_collections__pb2.ListResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
@@ -176,7 +176,7 @@ class Collections(object):
             timeout=None,
             metadata=None):
         return grpc.experimental.unary_unary(request, target, '/content.collections.Collections/Update',
-            collections_dot_collections__pb2.UpdateRequest.SerializeToString,
+            collections__perxis_dot_collections__pb2.UpdateRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
@@ -193,7 +193,7 @@ class Collections(object):
             timeout=None,
             metadata=None):
         return grpc.experimental.unary_unary(request, target, '/content.collections.Collections/Delete',
-            collections_dot_collections__pb2.DeleteRequest.SerializeToString,
+            collections__perxis_dot_collections__pb2.DeleteRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
diff --git a/proto/contentcollections/collections.proto b/proto/collections/collections.proto
similarity index 100%
rename from proto/contentcollections/collections.proto
rename to proto/collections/collections.proto
-- 
GitLab