Update up-core-api protos

.gitignore

@@ -5,4 +5,6 @@
 **/*.egg-info/
 **/.DS_Store
 .vscode
-.coverage
+.coverage
+target
+**/proto

README.adoc

@@ -13,17 +13,46 @@ image:https://raw.githubusercontent.com/eclipse-uprotocol/uprotocol-spec/main/up
 
 == Getting Started
 
+=== Prerequisites
+Before proceeding with the setup of this project, ensure that the following prerequisites are met:
+
+* Maven is installed and configured in your environment. You can verify this by running the following command in your terminal:
+[,bash]
+----
+mvn -version
+----
+If Maven is properly installed, you should see information about the Maven version and configuration.
+
 === Importing the sdk
-
-Setup SDK local repository and install
+
+To set up SDK, follow the steps below:
+
+. Clone the code from the GitHub repository:
++
+[source]
+----
+git clone https://github.com/eclipse-uprotocol/uprotocol-python.git
+----
+
+. Execute the `pull_and_compile_protos.py` script using the following command:
++
+[source]
+----
+python pull_and_compile_protos.py
+----
+This script automates the following tasks:
+
+1. **Cloning and Compilation of Protos:**
+   Clones the `up-core-api` protos from the specified repository URL, compiles them, and generates Python protofiles in the protos folder.
+
+. Install up-python
++
 [source]
 ----
-$ git clone https://github.com/eclipse-uprotocol/uprotocol-python.git
-$ cd uprotocol-python
-$ pip install .
+python -m pip install .
 ----
-*This will install the uprotocol-python, making its classes and modules available for import in your python code.*
 
+*This will install the up-python, making its classes and modules available for import in your python code.*
 
 === Using The Sdk
 

pull_and_compile_protos.py

@@ -0,0 +1,124 @@
+# -------------------------------------------------------------------------
+#
+# Copyright (c) 2023 General Motors GTO LLC
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# SPDX-FileType: SOURCE
+# SPDX-FileCopyrightText: 2023 General Motors GTO LLC
+# SPDX-License-Identifier: Apache-2.0
+#
+# -------------------------------------------------------------------------
+
+import os
+import re
+import shutil
+import subprocess
+
+import git
+from git import Repo
+
+REPO_URL = "https://github.com/eclipse-uprotocol/up-core-api.git"
+PROTO_REPO_DIR = "target"
+TAG_NAME = "uprotocol-core-api-1.5.6"
+PROTO_OUTPUT_DIR = os.path.join("uprotocol", "proto")
+
+
+def clone_or_pull(repo_url, PROTO_REPO_DIR):
+    try:
+        repo = Repo.clone_from(repo_url, PROTO_REPO_DIR)
+        print(f"Repository cloned successfully from {repo_url} to {PROTO_REPO_DIR}")
+        # Checkout the specific tag
+        repo.git.checkout(TAG_NAME)
+    except git.exc.GitCommandError as clone_error:
+        try:
+            git_pull_command = ["git", "pull", "origin", TAG_NAME]
+            subprocess.run(git_pull_command, cwd=PROTO_REPO_DIR, check=True)
+            print("Git pull successful after clone failure.")
+        except subprocess.CalledProcessError as pull_error:
+            print(f"Error during Git pull: {pull_error}")
+
+
+def execute_maven_command(project_dir, command):
+    try:
+        with subprocess.Popen(command, cwd=os.path.join(os.getcwd(), project_dir), shell=True, stdout=subprocess.PIPE,
+                              stderr=subprocess.PIPE, text=True) as process:
+            stdout, stderr = process.communicate()
+            print(stdout)
+
+            if process.returncode != 0:
+                print(f"Error: {stderr}")
+            else:
+                print("Maven command executed successfully.")
+                src_directory = os.path.join(os.getcwd(), project_dir, "target", "generated-sources", "protobuf",
+                                             "python")
+                # if not os.path.exists(PROTO_OUTPUT_DIR):
+                #     os.makedirs(PROTO_OUTPUT_DIR)
+
+                shutil.copytree(src_directory, PROTO_OUTPUT_DIR, dirs_exist_ok=True)
+                process_python_protofiles(PROTO_OUTPUT_DIR)
+    except Exception as e:
+        print(f"Error executing Maven command: {e}")
+
+
+def replace_in_file(file_path, search_pattern, replace_pattern):
+    with open(file_path, 'r') as file:
+        file_content = file.read()
+
+    updated_content = re.sub(search_pattern, replace_pattern, file_content)
+
+    with open(file_path, 'w') as file:
+        file.write(updated_content)
+
+
+def process_python_protofiles(directory):
+    for root, dirs, files in os.walk(directory):
+        create_init_py(root)
+        for file in files:
+            if file.endswith('.py'):
+                file_path = os.path.join(root, file)
+                replace_in_file(file_path, r'import uri_pb2', 'import uprotocol.proto.uri_pb2')
+                replace_in_file(file_path, r'import uuid_pb2', 'import uprotocol.proto.uuid_pb2')
+                replace_in_file(file_path, r'import uprotocol_options_pb2',
+                                'import uprotocol.proto.uprotocol_options_pb2')
+                replace_in_file(file_path, r'import uattributes_pb2', 'import uprotocol.proto.uattributes_pb2')
+                replace_in_file(file_path, r'import upayload_pb2', 'import uprotocol.proto.upayload_pb2')
+                replace_in_file(file_path, r'import ustatus_pb2', 'import uprotocol.proto.ustatus_pb2')
+                replace_in_file(file_path, r'import upayload_pb2', 'import uprotocol.proto.upayload_pb2')
+                replace_in_file(file_path, r'import umessage_pb2', 'import uprotocol.proto.umessage_pb2')
+
+
+def create_init_py(directory):
+    init_file_path = os.path.join(directory, "__init__.py")
+
+    # Check if the file already exists
+    if not os.path.exists(init_file_path):
+        # Create an empty __init__.py file
+        with open(init_file_path, "w"):
+            pass
+
+
+def execute():
+    clone_or_pull(REPO_URL, PROTO_REPO_DIR)
+
+    # Execute mvn compile-python
+    maven_command = "mvn protobuf:compile-python"
+    execute_maven_command(PROTO_REPO_DIR, maven_command)
+
+
+if __name__ == "__main__":
+    execute()

setup.cfg

@@ -1,11 +1,11 @@
 [metadata]
-name = uprotocol-python
+name = up-python
 author = Neelam Kushwah
 author_email = neelam.kushwah@gm.com
 description = UProtocol Python SDK
-version = 1
+version = 1.5.2
 keywords =
-  uprotocol
+  up
   python
 
 [options]
@@ -14,6 +14,5 @@ packages = find:
 zip_safe = False
 install_requires =
   cloudevents
-;   googleapis-common-protos>=1.56.4