rccn-gen 1.3.1__tar.gz → 1.3.3__tar.gz

{rccn_gen-1.3.1 → rccn_gen-1.3.3}/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGE LOG
 
+### [1.3.3] - 2025-05-26
+- Fixed toml file error. Added new create_toml_file method for the Application class.
+- Updated minimum required python version
+- Updated toml file contents
+
+### [1.3.2] - 2025-05-26
+- Fixed base command hinheritance bug
+
 ### [1.3.1] - 2025-05-15
 - Added documentation for utils.py
 

{rccn_gen-1.3.1 → rccn_gen-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rccn_gen
-Version: 1.3.1
+Version: 1.3.3
 Summary: A python based generator for RACCOON OS source files in Rust from yamcs-pymdb config files.
 Project-URL: Homepage, https://gitlab.com/rccn/pymdb_code_generation
 Project-URL: Issues, https://gitlab.com/rccn/pymdb_code_generation/issues
@@ -8,7 +8,7 @@ Author-email: Fabian Krech <f.krech@tu-berlin.de>
 License-Expression: GPL-3.0
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.8
+Requires-Python: >=3.12
 Requires-Dist: case-converter>=1.2.0
 Requires-Dist: inflect>=7.5.0
 Requires-Dist: yamcs-pymdb>=0.1.0

{rccn_gen-1.3.1 → rccn_gen-1.3.3}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "hatchling.build"
 
 [project]
 name = "rccn_gen"
-version = "1.3.1"
+version = "1.3.3"
 authors = [
   { name="Fabian Krech", email="f.krech@tu-berlin.de" },
 ]
 description = "A python based generator for RACCOON OS source files in Rust from yamcs-pymdb config files."
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.12"
 dependencies = [
     "yamcs-pymdb>=0.1.0",
     "inflect>=7.5.0",

{rccn_gen-1.3.1 → rccn_gen-1.3.3}/src/rccn_gen/systems.py

@@ -169,6 +169,9 @@ class Application(Subsystem):
             'main_template': os.path.join(self.text_modules_main_path, 'main.txt'),
             'cargo_toml': os.path.join(self.export_directory, 'rccn_usr_'+snakecase(self.name), 'Cargo.toml'),
             'cargo_toml_template': os.path.join(self.text_modules_path, 'cargo_toml', 'cargo.txt'),
+            'cargo_toml_generated_snapshot': os.path.join(self.snapshot_directory, 'generated', 'rccn_usr_'+snakecase(self.name), 'cargo.toml'),
+            'cargo_toml_user_snapshot': os.path.join(self.user_snapshot_path(), 'rccn_usr_'+snakecase(self.name), 'cargo.toml'),
+            'cargo_toml_diff': os.path.join(self.diff_directory, 'rccn_usr_'+snakecase(self.name), 'cargo.diff'),
         }
         return paths
 
@@ -407,12 +410,34 @@ class Application(Subsystem):
         
     def generate_cargo_toml_file(self):
         """
-        Generate the Cargo.toml file for the application.
+        Generate the cargo.toml file for the application.
+        
+        Performs several tasks:
+        1. Creates diff file if both current and snapshot files exist
+        2. Creates snapshot of current main with user changes if snapshots are enabled
+        3. Generates new cargo.toml file from template
+        4. Creates snapshot of newly generated main if snapshots are enabled
+        5. Applies user changes from diff file if rebase_changes is enabled
         """
+        # Create cargo_toml.diff file
+        if os.path.exists(self.file_paths()['cargo_toml']) and os.path.exists(self.file_paths()['cargo_toml_generated_snapshot']):
+            os.maked(os.path.dirname(self.file_paths()['cargo_toml_diff']), exist_ok=True)
+            self.generate_diff_file('cargo_toml', 'cargo_toml_generated_snapshot', 'cargo_toml_diff')
+        # Create snapshot of cargo_toml with user changes if instructed
+        if self.snapshots and os.path.exists(self.file_paths()['cargo_toml']):
+            self.generate_snapshot('cargo_toml', 'cargo_toml_user_snapshot')
+        # Generate cargo_toml file
         with open(self.file_paths()['cargo_toml_template'], 'r') as file:
             cargo_toml_template_text = file.read()
         with open(self.file_paths()['cargo_toml'], 'w') as file:
-            file.write(cargo_toml_template_text)
+            new_cargo_toml_text = self.find_and_replace_keywords(cargo_toml_template_text)
+            file.write("".join(new_cargo_toml_text))
+        # Create snapshot of newly generated cargo_toml if instructed
+        if self.snapshots:
+            self.generate_snapshot('cargo_toml', 'cargo_toml_generated_snapshot')
+        # Rebase cargo_toml.diff on cargo_toml if instructed
+        if self.rebase_changes and os.path.exists(self.file_paths()['cargo_toml_diff']):
+            os.system('patch '+self.file_paths()['cargo_toml']+' <  '+self.file_paths()['cargo_toml_diff'])
 
 
 class Service(Subsystem):
@@ -974,7 +999,7 @@ class RCCNCommand(Command):
         - If no subtype is provided, a unique one will be assigned automatically
         - The command's APID is automatically set to match the service's application APID
         """
-        if not 'base' in self.init_kwargs and not any(command.name == 'base' for command in service.commands):
+        if self.init_kwargs['base'] is None and not any(command.name == 'base' for command in service.commands):
             print("RCCN-Information: Command \'"+self.init_kwargs['name']+"\' doesn\'t have a base argument and no base command was found in service \'"+service.name+"\'.\nStandard base command will be created with system = \'"+service.name+"\' and type = "+str(service.service_id)+".")
             self.init_kwargs['base'] = Command(
                 system=service, 
@@ -983,7 +1008,7 @@ class RCCNCommand(Command):
                 base='/PUS/pus-tc',
                 assignments={'type': service.service_id}
             )
-        elif not 'base' in self.init_kwargs and any(command.name == 'base' for command in service.commands):
+        elif self.init_kwargs['base'] is None and any(command.name == 'base' for command in service.commands):
             print("RCCN-Information: Command \'"+self.init_kwargs['name']+"\' doesn\'t have a \'base\' argument. Existing base command for service \'"+service.name+"\' will be used.")
             self.init_kwargs['base'] = next(command for command in service.commands if command.name == 'base')
         if 'system' in self.init_kwargs and isinstance(self.init_kwargs['system'], Service):
@@ -991,7 +1016,7 @@ class RCCNCommand(Command):
         else:
             super().__init__(system=service, *self.init_args, **self.init_kwargs)
         self.assignments['apid'] = self.system.system.apid
-        if not 'subtype' in self.assignments and self.name is not 'base':
+        if not 'subtype' in self.assignments and self.name != 'base':
             used_subtypes = [command.assignments['subtype'] if 'subtype' in command.assignments else None for command in self.system.rccn_commands()]
             new_subtype = 1
             while new_subtype in used_subtypes:

{rccn_gen-1.3.1 → rccn_gen-1.3.3}/src/rccn_gen/text_modules/cargo_toml/cargo.txt

@@ -1,7 +1,7 @@
 [package]
-name = "rccn_usr_example_app"
+name = "rccn_user_<<VAR_APP_NAME_SCASE>>"
 version = "0.1.0"
-edition = "2021"
+edition = "2025"
 
 [dependencies]
 anyhow = "1.0.91"
@@ -14,4 +14,7 @@ spacepackets = "0.12.0"
 tokio = "1.41.1"
 env_logger = { version = "0.11.7", default-features = false, features = ["color", "humantime"] }
 num-derive = "0.4"
-num-traits = "0.2"
+num-traits = "0.2"
+rccn_usr_bitstruct_derive = { version = "0.1.0", path = "../rccn_usr_bitstruct_derive" }
+rccn_usr_pus_macros = { version = "0.1.0", path = "../rccn_usr_pus_macros" }
+chrono = "0.4.40"