combine cdr_system + model

CHANGELOG.md

@@ -4,14 +4,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [0.4.1] - 2024-05-06
+## [0.4.2] - 2024-05-09
 
 ### Changed
+- add model to cdr_system (for example uiuc_golden_muscat) when saving to cdr
+
+## [0.4.1] - 2024-05-06
 
+### Changed
 - docker image will have the CDR_SYSTEM_VERSION set automatically based on tag/branch/pr
 
 ### Fixed
-
 - saving raster for point features
 
 ## [0.4.0] - 2024-05-02

pipeline.py

@@ -365,7 +365,8 @@ def construct_pipeline(args):
     infer_step = p.add_step(func=pipeline_steps.segmentation_inference, args=(legend_step.output(), model, devices), display='Segmenting Map Units', workers=infer_workers)
     geom_step = p.add_step(func=pipeline_steps.generate_geometry, args=(infer_step.output(), model.name, model.version), display='Generating Vector Geometry', workers=infer_workers*2)
     # Save Output
-    save_step = p.add_step(func=pipeline_steps.save_output, args=(geom_step.output(), args.output, args.feedback, args.output_types, args.cdr_system, args.cdr_system_version), display='Saving Output', workers=infer_workers*2)
+    cdr_system_model = f"{args.cdr_system}_{args.model}"
+    save_step = p.add_step(func=pipeline_steps.save_output, args=(geom_step.output(), args.output, args.feedback, args.output_types, cdr_system_model, args.cdr_system_version), display='Saving Output', workers=infer_workers*2)
     # Validation
     if args.validation: 
         valid_step = p.add_step(func=pipeline_steps.validation, args=(geom_step.output(), args.validation, args.feedback), display='Validating Output', workers=infer_workers*2)
@@ -406,7 +407,8 @@ def construct_amqp_pipeline(args):
     infer_step = p.add_step(func=pipeline_steps.segmentation_inference, args=(legend_step.output(), model, devices), display='Segmenting Map Units', workers=infer_workers)
     geom_step = p.add_step(func=pipeline_steps.generate_geometry, args=(infer_step.output(), model.name, model.version), display='Generating Vector Geometry', workers=infer_workers*2)
     # Save Output
-    save_step = p.add_step(func=pipeline_steps.save_output, args=(geom_step.output(), args.output, args.feedback, args.output_types, args.cdr_system, args.cdr_system_version), display='Saving Output', workers=infer_workers*2)
+    cdr_system_model = f"{args.cdr_system}_{args.model}"
+    save_step = p.add_step(func=pipeline_steps.save_output, args=(geom_step.output(), args.output, args.feedback, args.output_types, cdr_system_model, args.cdr_system_version), display='Saving Output', workers=infer_workers*2)
     # Validation
     if args.validation: 
         valid_step = p.add_step(func=pipeline_steps.validation, args=(geom_step.output(), args.validation, args.feedback), display='Validating Output', workers=infer_workers*2)