krista-common-proto-schema 1.0.5__tar.gz → 1.0.7__tar.gz

{krista_common_proto_schema-1.0.5 → krista_common_proto_schema-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: krista_common_proto_schema
-Version: 1.0.5
+Version: 1.0.7
 Summary: Shared Protocol Buffer definitions.
 Home-page: https://github.com/your-org/krista-common-proto-schema
 Author: Krista

{krista_common_proto_schema-1.0.5 → krista_common_proto_schema-1.0.7}/krista_common_proto_schema/__init__.py

@@ -5,16 +5,12 @@ This package contains compiled Protocol Buffer definitions
 that can be imported directly in Python projects.
 
 Usage:
-    from krista_common_proto_schema import user_pb2, message_pb2
+    from krista_common_proto_schema.common import user_pb2, message_pb2
 
     user = user_pb2.User(id=1, name="John")
     message = message_pb2.Message(id=1, sender=user, content="Hello")
 """
 
-__version__ = "1.0.5"
+__version__ = "1.0.7"
 
-# Import compiled proto modules for easy access
-from . import user_pb2
-from . import message_pb2
-
-__all__ = ["user_pb2", "message_pb2"]
+__all__ = ["common"]

{krista_common_proto_schema-1.0.5 → krista_common_proto_schema-1.0.7}/krista_common_proto_schema/common/message_pb2.py

@@ -22,7 +22,7 @@ _runtime_version.ValidateProtobufRuntimeVersion(
 _sym_db = _symbol_database.Default()
 
 
-from common import user_pb2 as common_dot_user__pb2
+from krista_common_proto_schema.common import user_pb2 as common_dot_user__pb2
 
 
 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x63ommon/message.proto\x12\x06\x63ommon\x1a\x11\x63ommon/user.proto\"z\n\x07Message\x12\n\n\x02id\x18\x01 \x01(\x05\x12\x1c\n\x06sender\x18\x02 \x01(\x0b\x32\x0c.common.User\x12\x0f\n\x07\x63ontent\x18\x03 \x01(\t\x12\x11\n\ttimestamp\x18\x04 \x01(\x03\x12!\n\x04type\x18\x05 \x01(\x0e\x32\x13.common.MessageType*7\n\x0bMessageType\x12\x08\n\x04TEXT\x10\x00\x12\t\n\x05IMAGE\x10\x01\x12\t\n\x05VIDEO\x10\x02\x12\x08\n\x04\x46ILE\x10\x03\x42\'\n\x17\x63om.krista.proto.commonB\x0cMessageProtob\x06proto3')

{krista_common_proto_schema-1.0.5 → krista_common_proto_schema-1.0.7}/krista_common_proto_schema.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: krista-common-proto-schema
-Version: 1.0.5
+Version: 1.0.7
 Summary: Shared Protocol Buffer definitions.
 Home-page: https://github.com/your-org/krista-common-proto-schema
 Author: Krista

{krista_common_proto_schema-1.0.5 → krista_common_proto_schema-1.0.7}/setup.py

@@ -23,6 +23,7 @@ from distutils.command.build import build
 import subprocess
 import os
 import shutil
+import re
 from pathlib import Path
 
 
@@ -64,8 +65,9 @@ class BuildProtoCommand(build_py):
         version_file = Path("../VERSION")
         version = version_file.read_text().strip()
 
-        # Create output directory
+        # Create output directory and subdirectories
         output_dir.mkdir(exist_ok=True)
+        (output_dir / "common").mkdir(exist_ok=True)
 
         # Create __init__.py with dynamic version
         init_file = output_dir / "__init__.py"
@@ -76,7 +78,7 @@ This package contains compiled Protocol Buffer definitions
 that can be imported directly in Python projects.
 
 Usage:
-    from krista_common_proto_schema import user_pb2, message_pb2
+    from krista_common_proto_schema.common import user_pb2, message_pb2
 
     user = user_pb2.User(id=1, name="John")
     message = message_pb2.Message(id=1, sender=user, content="Hello")
@@ -84,11 +86,7 @@ Usage:
 
 __version__ = "{version}"
 
-# Import compiled proto modules for easy access
-from . import user_pb2
-from . import message_pb2
-
-__all__ = ["user_pb2", "message_pb2"]
+__all__ = ["common"]
 ''')
         
         # Find all .proto files
@@ -105,13 +103,13 @@ __all__ = ["user_pb2", "message_pb2"]
         # Compile each proto file
         for proto_file in proto_files:
             print(f"\n🔨 Compiling {proto_file}...")
-            
+
             try:
                 subprocess.run(
                     [
                         "python3", "-m", "grpc_tools.protoc",
                         f"-I={proto_dir}",
-                        f"--python_out={output_dir}",
+                        f"--python_out={output_dir.absolute()}",
                         str(proto_file)
                     ],
                     check=True,
@@ -122,7 +120,21 @@ __all__ = ["user_pb2", "message_pb2"]
             except subprocess.CalledProcessError as e:
                 print(f"   ❌ Error: {e.stderr}")
                 raise
-        
+
+        # Fix imports in generated Python files
+        print(f"\n🔧 Fixing imports in generated Python files...")
+        for py_file in output_dir.rglob("*_pb2.py"):
+            content = py_file.read_text()
+            # Replace "from common import" with "from krista_common_proto_schema.common import"
+            fixed_content = re.sub(
+                r'from common import (\w+)',
+                r'from krista_common_proto_schema.common import \1',
+                content
+            )
+            if fixed_content != content:
+                py_file.write_text(fixed_content)
+                print(f"   ✅ Fixed imports in {py_file.name}")
+
         # Create __init__.py files in all subdirectories to make them packages
         print("\n📦 Creating __init__.py files in subdirectories...")
         for subdir in output_dir.rglob("*"):