sbdl 1.18.19__tar.gz → 1.18.20__tar.gz

{sbdl-1.18.19 → sbdl-1.18.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sbdl
-Version: 1.18.19
+Version: 1.18.20
 Summary: System Behaviour Description Language (Compiler)
 Home-page: https://sbdl.dev
 Author: Michael A. Hicks

{sbdl-1.18.19 → sbdl-1.18.20}/sbdl.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sbdl
-Version: 1.18.19
+Version: 1.18.20
 Summary: System Behaviour Description Language (Compiler)
 Home-page: https://sbdl.dev
 Author: Michael A. Hicks

{sbdl-1.18.19 → sbdl-1.18.20}/sbdl.py

@@ -221,8 +221,8 @@ _A=True
 import argparse,base64,datetime,csv,functools,getpass,hashlib,importlib,io,json,os,pathlib,pickle,platform,re,shlex,string,subprocess,sys,tarfile,tempfile,textwrap,time,traceback,types,unittest,urllib.request,urllib.parse,warnings,zlib,zipfile
 warnings.filterwarnings(_A1,category=DeprecationWarning)
 __NAME=_j
-__VERSION='1.18.19'
-__VERSION_DEV='ab2813a'
+__VERSION='1.18.20'
+__VERSION_DEV='4102984'
 __VERSION_DSL='25.6'
 __VERSION_REST_API='1.1.0'
 __AUTHOR='contact@sbdl.dev'
@@ -585,7 +585,7 @@ class SBDL_Parser:
 		def git_commit_hash(macros,*inp):
 			param_path=''.join(inp);config_path=os.path.join(macros[SBDL_Parser.Macros.path].replace(macros[SBDL_Parser.Macros.file_name],''),param_path)
 			try:repo_root=pathlib.Path(config_path).resolve();hash_value=subprocess.check_output(['git','-C',str(repo_root),'rev-parse','--short','HEAD'],text=_A).strip()
-			except Exception as e:raise self.MacroReplaceException(f"ERROR retrieving Git commit hash: {e}",first_pass_can_ignore=_C)
+			except Exception as e:hash_value='GIT_HASH_UNAVAILABLE';f_print(f"{macros[SBDL_Parser.Macros.file_name]}:{macros[SBDL_Parser.Macros.line]}:: WARNING cannot retrieve Git commit hash: {e}",warning=_A)
 			return hash_value
 		def identifier_from_property(macros,*inp):
 			A='SBDL_PROPERTY_VALUE_CACHE_MEMO'
@@ -2611,6 +2611,11 @@ class OpenFMEA:
 				if not raw:content=result[1:-1];result=SBDL_Parser.Tokens.replacement_string_default.join(content.split());result=SBDL_Parser.sanitize_identifier(result)
 		return result
 	@classmethod
+	def remove_id_from_description(self,description):
+		result=description;id_string=self.get_id_from_string(description,_A)
+		if id_string!=_B:result=result.replace(id_string,'')
+		return result
+	@classmethod
 	def add_id_to_string(self,identifier,string_content):return'[{}] {}'.format(identifier,string_content)
 	@classmethod
 	def sbdl_elements_from_table(self,sbdl_table,_):return self.elements_from_table(sbdl_table,_)
@@ -2626,10 +2631,6 @@ class OpenFMEA:
 				if not attr_type in id_lookup:id_lookup[attr_type]={};id_lookup[attr_type][A]=1
 				result=id_lookup[attr_type][attr]=replace_str.join((elems_to_consider[attr_type]+replace_str+str(id_lookup[attr_type][A]).zfill(3)).split());id_lookup[attr_type][A]+=1
 			return result
-		def remove_id_from_description(description):
-			result=description;id_string=self.get_id_from_string(description,_A)
-			if id_string!=_B:result=result.replace(id_string,'')
-			return result
 		def split_multi_field(multi_data):return[x.strip()for x in str(multi_data).split(multi_field_separator)]
 		def present_on_relevant_rows(source_content,source_column,target_content,target_column):
 			result=_A
@@ -2656,7 +2657,7 @@ class OpenFMEA:
 		def handle_elem(row_data,attr):
 			attr_data_full=split_multi_field(row_data[attr])
 			for attr_data in attr_data_full:
-				attr_data_no_id=remove_id_from_description(attr_data).strip()
+				attr_data_no_id=self.remove_id_from_description(attr_data).strip()
 				if len(attr_data)>0:
 					if attr in elems_to_consider:
 						id_ref=get_id_from_attr(attr,attr_data);elem=_B
@@ -2685,7 +2686,7 @@ class OpenFMEA:
 			if'id'in gen_elem_obj and _P in gen_elem_obj and _K in gen_elem_obj:
 				if gen_elem_obj[_K]in supported_general_types:
 					if supported_general_types[gen_elem_obj[_K]][B]==0:supported_general_types[gen_elem_obj[_K]][B]+=1;new_customtype_statement=SBDL_Parser.parse_customtype(SBDL_Parser.Parser_Element(supported_general_types[gen_elem_obj[_K]][C],_AC,0));new_customtype_def=SBDL_CustomType(new_customtype_statement);general_elements.append(new_customtype_def)
-					new_gen_elem=SBDL_Element_Synthetic(entry_identifier(gen_elem_obj),gen_elem_obj[_P],supported_general_types[gen_elem_obj[_K]][A],_B)
+					new_gen_elem=SBDL_Element_Synthetic(entry_identifier(gen_elem_obj),self.remove_id_from_description(gen_elem_obj[_P]),supported_general_types[gen_elem_obj[_K]][A],_B)
 					if D in gen_elem_obj:
 						for edge in gen_elem_obj[D]:
 							explicit_identifier=self.get_id_from_string(edge);matching_identifier=_B;matching_type=_B

{sbdl-1.18.19 → sbdl-1.18.20}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
   name='sbdl',
-  version='1.18.19',
+  version='1.18.20',
   description = "System Behaviour Description Language (Compiler)",
   author = "Michael A. Hicks",
   author_email = "michael@mahicks.org",