FEM-Design 0.0.6__tar.gz → 0.0.8__tar.gz

{fem_design-0.0.6/src → fem_design-0.0.8}/FEM_Design.egg-info/PKG-INFO

@@ -1,19 +1,21 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: FEM-Design
-Version: 0.0.6
+Version: 0.0.8
 Summary: The FEM-Design API package
 Author-email: FEM-Design <femdesign.api@strusoft.com>
 Maintainer-email: Marco Pellegrino <marco.pellegrino@strusoft.com>, Illyés Zoltán <sinnach@strusoft.hu>
+License: MIT
 Project-URL: Homepage, https://femdesign-api-docs.onstrusoft.com
-Project-URL: Repository, https://github.com/strusoft/femdesign-api
+Project-URL: Repository, https://github.com/strusoft/femdesign-api/tree/master/FemDesign.Python
 Project-URL: Issues, https://github.com/strusoft/femdesign-api/issues
 Keywords: fem,fea,structures,strusoft,FEM-Design API
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: Microsoft
+Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: pywin32>=306
+Dynamic: license-file
 
 
 
@@ -61,9 +63,8 @@ except Exception as err:
     raise err
 ```
 
-A wider list of examples can be found in [example](https://github.com/strusoft/femdesign-api/tree/master/FemDesign.Python/examples)
+A wider list of examples can be found in [example](https://github.com/strusoft/femdesign-api/tree/master/FemDesign.Examples/Python)
 
 ## Documentation
 
-
 https://femdesign-api-docs.onstrusoft.com/docs/intro

fem_design-0.0.8/FEM_Design.egg-info/SOURCES.txt

@@ -0,0 +1,19 @@
+LICENSE
+README.md
+pyproject.toml
+FEM_Design.egg-info/PKG-INFO
+FEM_Design.egg-info/SOURCES.txt
+FEM_Design.egg-info/dependency_links.txt
+FEM_Design.egg-info/requires.txt
+FEM_Design.egg-info/top_level.txt
+femdesign/__init__.py
+femdesign/comunication.py
+femdesign/calculate/__init__.py
+femdesign/calculate/analysis.py
+femdesign/calculate/command.py
+femdesign/calculate/fdscript.py
+femdesign/utilities/__init__.py
+femdesign/utilities/filehelper.py
+test/test_analysis.py
+test/test_command.py
+test/test_pipe.py

fem_design-0.0.8/FEM_Design.egg-info/requires.txt

@@ -0,0 +1 @@
+pywin32>=306

{fem_design-0.0.6 → fem_design-0.0.8}/PKG-INFO

@@ -1,19 +1,21 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: FEM-Design
-Version: 0.0.6
+Version: 0.0.8
 Summary: The FEM-Design API package
 Author-email: FEM-Design <femdesign.api@strusoft.com>
 Maintainer-email: Marco Pellegrino <marco.pellegrino@strusoft.com>, Illyés Zoltán <sinnach@strusoft.hu>
+License: MIT
 Project-URL: Homepage, https://femdesign-api-docs.onstrusoft.com
-Project-URL: Repository, https://github.com/strusoft/femdesign-api
+Project-URL: Repository, https://github.com/strusoft/femdesign-api/tree/master/FemDesign.Python
 Project-URL: Issues, https://github.com/strusoft/femdesign-api/issues
 Keywords: fem,fea,structures,strusoft,FEM-Design API
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: Microsoft
+Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: pywin32>=306
+Dynamic: license-file
 
 
 
@@ -61,9 +63,8 @@ except Exception as err:
     raise err
 ```
 
-A wider list of examples can be found in [example](https://github.com/strusoft/femdesign-api/tree/master/FemDesign.Python/examples)
+A wider list of examples can be found in [example](https://github.com/strusoft/femdesign-api/tree/master/FemDesign.Examples/Python)
 
 ## Documentation
 
-
 https://femdesign-api-docs.onstrusoft.com/docs/intro

{fem_design-0.0.6 → fem_design-0.0.8}/README.md

@@ -44,9 +44,8 @@ except Exception as err:
     raise err
 ```
 
-A wider list of examples can be found in [example](https://github.com/strusoft/femdesign-api/tree/master/FemDesign.Python/examples)
+A wider list of examples can be found in [example](https://github.com/strusoft/femdesign-api/tree/master/FemDesign.Examples/Python)
 
 ## Documentation
 
-
 https://femdesign-api-docs.onstrusoft.com/docs/intro

fem_design-0.0.8/femdesign/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.0.7"

{fem_design-0.0.6/src → fem_design-0.0.8}/femdesign/calculate/command.py

@@ -383,6 +383,30 @@ class CmdSaveDocx(Command):
         return cmd_save_docx
 
 
+class CmdChild(Command):
+    """class to represent the fdscript cmdsavedocx command
+    """
+    def __init__(self, file_name : str):
+        """Constructor for the CmdChild class
+
+        Args:
+            file_name (str): path to the file to save
+        """
+        if not file_name.endswith(".dsc"):
+            raise ValueError("file_name must have suffix .dsc")
+
+        self.file_name = os.path.abspath(file_name)
+
+    def to_xml_element(self) -> ET.Element:
+        """Convert the CmdChild object to an xml element
+
+        Returns:
+            ET.Element: xml element representing the CmdChild object
+        """
+        cmd_child = ET.Element("cmdchild")
+        cmd_child.text = self.file_name
+
+        return cmd_child
 
 
 class CmdListGen:
@@ -442,4 +466,71 @@ class CmdListGen:
                 guid_elem = ET.SubElement(cmd_listgen, "GUID")
                 guid_elem.text = str(guid)
 
-        return cmd_listgen
+        return cmd_listgen
+
+class CmdConfig(Command):
+    """class to represent the fdscript cmdconfig command
+    """
+    def __init__(self, file_name : str):
+        """Constructor for the CmdConfig class
+
+        Args:
+            file_name (str): path to the config file
+        """
+        if not file_name.endswith(".xml"):
+            raise ValueError("file_name must have suffix .xml")
+
+        self.file_name = os.path.abspath(file_name)
+
+    def to_xml_element(self) -> ET.Element:
+        """Convert the CmdConfig object to an xml element
+
+        Returns:
+            ET.Element: xml element representing the CmdConfig object
+        """
+        cmd_config = ET.Element("cmdconfig")
+
+        attributes = {
+            "command": "$ MODULECOM APPLYCFG",
+            "file": self.file_name
+        }
+        cmd_config.attrib = attributes
+
+        return cmd_config
+    
+# <cmdinteractionsurface command="$ CODE_COM INTERACTIONSURFACE" guid="2e290437-e86a-4e36-af7d-acde6a6146c8" offset="0.0" fUlt="false" outfile="e:\res\a.txt"  />
+class CmdInteractionSurface(Command):
+    """class to represent the fdscript cmdinteraction surface command
+    """
+    def __init__(self, guid : uuid.UUID, outfile : str, offset : float = 0.0, fUlt : bool = False):
+        """Constructor for the CmdInteractionSurface class
+
+        Args:
+            guid (uuid.UUID): guid of an existing bar. make sure you pass the analytical bar!
+            outfile (str): path to the output file
+            offset (float): offset is cross-section position, measured along the bar from the starting point [m]
+            fUlt (bool): fUlt is true for Ultimate, false for Accidental or Seismic combination (different gammaC)
+        """
+        self.guid = guid
+        self.offset = offset
+        self.fUlt = fUlt
+        self.outfile = os.path.abspath(outfile)
+
+    def to_xml_element(self) -> ET.Element:
+        """Convert the CmdInteractionSurface object to an xml element
+
+        Returns:
+            ET.Element: xml element representing the CmdInteractionSurface object
+        """
+        cmd_interaction_surface = ET.Element("cmdinteractionsurface")
+
+        attributes = {
+            "command": "$ CODE_COM INTERACTIONSURFACE",
+            "guid": str(self.guid),
+            "offset": str(self.offset),
+            "fUlt": str(self.fUlt).lower(),
+            "outfile": self.outfile
+        }
+        cmd_interaction_surface.attrib = attributes
+
+        return cmd_interaction_surface

{fem_design-0.0.6/src → fem_design-0.0.8}/femdesign/calculate/fdscript.py

@@ -12,6 +12,9 @@ class FdscriptHeader:
         self.version = str(version)
         self.module = module
         self.logfile = os.path.abspath(log_file)
+    
+        self.continue_on_error = True
+        self.ignore_Parse_error = True
 
 
     def to_xml_element(self) -> ET.Element:
@@ -21,7 +24,7 @@ class FdscriptHeader:
             ET.Element: xml element representing the FdscriptHeader object
         """
         fdscript_header = ET.Element("fdscriptheader")
-        
+
         title_elem = ET.SubElement(fdscript_header, "title")
         title_elem.text = self.title
 
@@ -34,6 +37,13 @@ class FdscriptHeader:
         logfile_elem = ET.SubElement(fdscript_header, "logfile")
         logfile_elem.text = self.logfile
 
+        ## add attributes
+        attributes = {
+            "fContinueOnError" : int(self.continue_on_error).__str__(),
+            "fIgnoreParseError" : int(self.ignore_Parse_error).__str__()
+        }
+
+        fdscript_header.attrib = attributes
 
         return fdscript_header
 
@@ -74,7 +84,7 @@ class Fdscript:
             fdscript.append(command.to_xml_element())
 
         return fdscript
-    
+
     def serialise_to_file(self, file_name : str):
         """Serialise the Fdscript object to a file
 

{fem_design-0.0.6/src → fem_design-0.0.8}/femdesign/comunication.py

@@ -6,7 +6,7 @@ from enum import Enum
 from femdesign.calculate.analysis import Analysis, Design
 from femdesign.calculate.fdscript import Fdscript
 from femdesign.utilities.filehelper import OutputFileHelper
-from femdesign.calculate.command import DesignModule, CmdUser, CmdCalculation, CmdListGen, CmdOpen, CmdProjDescr, CmdSave
+from femdesign.calculate.command import *
 
 import win32file
 import win32pipe
@@ -14,6 +14,8 @@ import win32pipe
 import os
 import shutil
 
+import uuid
+
 """
 FEM - Design usage with pipe
 
@@ -294,12 +296,9 @@ class Verbosity(Enum):
     PROGRESS_WINDOW_TITLE = 32
 
 
-## define a private class
-
-
 class FemDesignConnection(_FdConnect):
     def __init__(self,
-                 fd_path : str = r"C:\Program Files\StruSoft\FEM-Design 23\fd3dstruct.exe",
+                 fd_path : str = r"C:\Program Files\StruSoft\FEM-Design 24\fd3dstruct.exe",
                  pipe_name : str ="FdPipe1",
                  verbose : Verbosity = Verbosity.SCRIPT_LOG_LINES,
                  output_dir : str = None,
@@ -338,7 +337,6 @@ class FemDesignConnection(_FdConnect):
         self._output_dir = os.path.abspath(value)
         if not os.path.exists(value):
             os.makedirs(os.path.abspath(value))
-
     
     def RunScript(self, fdscript : Fdscript, file_name : str = "script"):
         """
@@ -440,7 +438,7 @@ class FemDesignConnection(_FdConnect):
         log = OutputFileHelper.GetLogFilePath(self.output_dir)
 
         if not file_name.endswith(".struxml") and not file_name.endswith(".str"):
-            raise ValueError(f"File {file_name} must have extension .struxml or .str")
+            raise ValueError(f"file_name must have extension .struxml or .str")
         if not os.path.exists(file_name):
             raise FileNotFoundError(f"File {file_name} not found")
 
@@ -458,11 +456,86 @@ class FemDesignConnection(_FdConnect):
         fdscript = Fdscript(log, [cmd_results])
         self.RunScript(fdscript, "generate_list_tables")
         
+    def SaveDocx(self, file_name : str, template_file : str = None):
+        """Save the project as docx
+
+        Args:
+            file_name (str): name of the file to save
+
+        Examples
+        --------
+        >>> pipe = FemDesignConnection()
+        >>> pipe.SaveDocx(r"outputFile.docx")
+        """
+        log = OutputFileHelper.GetLogFilePath(self.output_dir)
+
+
+        if template_file:
+            self.ApplyDocumentationTemplate(template_file)
+
+        cmd_save_docx = CmdSaveDocx(file_name)
+
+
+        fdscript = Fdscript(log, [cmd_save_docx])
+        self.RunScript(fdscript, "save_docx")
+    
+    def ApplyDocumentationTemplate(self, template_file : str):
+        """Apply documentation template
+
+        Args:
+            template_file (str): template file path
+        """
+        log = OutputFileHelper.GetLogFilePath(self.output_dir)
+
+        cmd_child = CmdChild(template_file)
+        fdscript = Fdscript(log, [cmd_child])
+        self.RunScript(fdscript, "apply_documentation_template")
+
+    def GenerateInteractionSurface(self, guid : uuid.UUID, outfile : str, offset : float = 0.0, fUlt : bool = True):
+        """Generate interaction surface
+
+        Args:
+            guid (uuid.UUID): guid of an existing bar. make sure you pass the analytical bar!
+            outfile (str): path to the output file
+            offset (float): offset is cross-section position, measured along the bar from the starting point [m]
+            fUlt (bool): fUlt is true for Ultimate, false for Accidental or Seismic combination (different gammaC)
+        """
+        log = OutputFileHelper.GetLogFilePath(self.output_dir)
+
+        cmd_interaction_surface = CmdInteractionSurface(guid, outfile, offset, fUlt)
+        fdscript = Fdscript(log, [cmd_interaction_surface])
+        self.RunScript(fdscript, "generate_interaction_surface")
+    
+    def SetDesignParameters(self, file_path : str):
+        """Set design parameters
+
+        Args:
+            file_path (str): path to the file
+        """
+        log = OutputFileHelper.GetLogFilePath(self.output_dir)
+
+        cmd_design_parameters = CmdConfig(file_path)
+        fdscript = Fdscript(log, [cmd_design_parameters])
+        self.RunScript(fdscript, "set_design_parameters")
 
     ## it does not work
-    def Disconnect(self):
+    # def DumpDesignParameters(self, file_path : str):
+    #     """Dump calculation and design parameters
+
+    #     Args:
+    #         file_path (str): xml file path where the design and calculation parameters will be dumped
+    #     """
+    #     if not file_path.endswith(".xml"):
+    #         raise ValueError("file_name must have suffix .xml")
+
+    #     file_path = os.path.abspath(file_path)
+    #     message = f"; CXL MODULECOM WXMLCFG:{file_path}"
+    #     self.Send(message)
+
+    # ## it does not work
+    # def Disconnect(self):
         super().Detach()
         win32pipe.DisconnectNamedPipe(self.pipe_send)
 
     def Close(self):
-        self.__exit__()
+        self.__exit__()

{fem_design-0.0.6 → fem_design-0.0.8}/pyproject.toml

@@ -1,6 +1,10 @@
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"
+
 [project]
 name = "FEM-Design"
-version = "0.0.6"
+version = "0.0.8"
 authors = [
   { name="FEM-Design", email="femdesign.api@strusoft.com" },
 ]
@@ -11,14 +15,21 @@ maintainers = [
 description = "The FEM-Design API package"
 readme = "README.md"
 requires-python = ">=3.8"
+dependencies = [
+    "pywin32>=306",
+]
 classifiers = [
     "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: MIT License",
-    "Operating System :: Microsoft",
+    "Operating System :: Microsoft :: Windows",
 ]
+license = {text = "MIT"}
 keywords = ["fem", "fea", "structures", "strusoft", "FEM-Design API"]
 
 [project.urls]
 Homepage = "https://femdesign-api-docs.onstrusoft.com"
-Repository = "https://github.com/strusoft/femdesign-api"
-Issues = "https://github.com/strusoft/femdesign-api/issues"
+Repository = "https://github.com/strusoft/femdesign-api/tree/master/FemDesign.Python"
+Issues = "https://github.com/strusoft/femdesign-api/issues"
+
+[tool.setuptools.packages.find]
+include = ["femdesign*"]
+exclude = ["test*", "packaging*"]

fem_design-0.0.8/test/test_analysis.py

@@ -0,0 +1,29 @@
+from femdesign.calculate.command import *
+from femdesign.calculate.analysis import Analysis, CombSettings, Design
+
+def test_design():
+    xmlDesign = Design(True, True, True).to_xml_element()
+
+    assert xmlDesign.tag == "design"
+    assert xmlDesign.attrib == {}
+    assert xmlDesign.text == None
+
+    assert xmlDesign.find("autodesign") != None
+    assert xmlDesign.find("autodesign").text == "true"
+    assert xmlDesign.find("check").text == "true"
+    assert xmlDesign.find("gmax") == None
+    assert xmlDesign.find("cmax") != None
+
+
+    xmlDesign = Design(False, False, False).to_xml_element()
+
+    assert xmlDesign.tag == "design"
+    assert xmlDesign.attrib == {}
+    assert xmlDesign.text == None
+
+    assert xmlDesign.find("autodesign") != None
+    assert xmlDesign.find("autodesign").text == "false"
+    assert xmlDesign.find("check").text == "false"
+
+    assert xmlDesign.find("gmax") != None
+    assert xmlDesign.find("cmax") == None

fem_design-0.0.8/test/test_command.py

@@ -0,0 +1,169 @@
+from femdesign.calculate.command import *
+from femdesign.calculate.analysis import Analysis, CombSettings
+
+def test_cmd_open():
+    file_path = "myFilePath.str"
+    xmlCmdOpen = CmdOpen(file_path).to_xml_element()
+
+    assert xmlCmdOpen.tag == "cmdopen"
+    assert xmlCmdOpen.attrib.get("command") == "; CXL CS2SHELL OPEN"
+    
+    filename = xmlCmdOpen.find("filename")
+    assert filename.text == os.path.join( os.getcwd(), file_path )
+    
+def test_cmd_child():
+    file_path = "template.dsc"
+    xmlCmdChild = CmdChild("template.dsc").to_xml_element()
+
+    assert xmlCmdChild.tag == "cmdchild"
+    assert xmlCmdChild.text == os.path.join( os.getcwd(), file_path)
+
+    try:
+        xmlCmdChild = CmdChild("template.3dm").to_xml_element()
+    except Exception as e:
+        assert isinstance(e, ValueError)
+        assert str(e) == "file_name must have suffix .dsc"
+
+def test_cmd_save():
+    file_path = "myFilePath.str"
+    xmlCmdSave = CmdSave(file_path).to_xml_element()
+
+    assert xmlCmdSave.tag == "cmdsave"
+    assert xmlCmdSave.attrib.get("command") == "; CXL CS2SHELL SAVE"
+    
+    filename = xmlCmdSave.find("filename")
+    assert filename.text == os.path.join( os.getcwd(), file_path )
+
+def test_cmd_user():
+    for user in User:
+        xmlCmdUser = CmdUser(user).to_xml_element()
+
+        assert xmlCmdUser.attrib.get("command") == f"; CXL $MODULE {user.name}"
+        assert xmlCmdUser.tag == "cmduser"
+
+def test_cmd_end_session():
+    xmlCmdEndSession = CmdEndSession().to_xml_element()
+
+    assert xmlCmdEndSession.tag == "cmdendsession"
+    assert xmlCmdEndSession.text == None
+    assert xmlCmdEndSession.attrib == {}
+
+def test_analysis():
+    xmlAnalysis = Analysis.StaticAnalysis().to_xml_element()
+
+    assert xmlAnalysis.tag == "analysis"
+
+    assert xmlAnalysis.attrib.get("calcCase") == "1"
+    assert xmlAnalysis.attrib.get("calcComb") == "1"
+    assert xmlAnalysis.find("Comb") is None
+    assert xmlAnalysis.attrib.get("calcStab") == "0"
+
+    xmlAnalysis = Analysis.StaticAnalysis(True, True).to_xml_element()
+    assert xmlAnalysis.attrib.get("calcCase") == "1"
+    assert xmlAnalysis.attrib.get("calcComb") == "1"
+    assert xmlAnalysis.find("comb") is None
+
+    xmlAnalysis = Analysis.StaticAnalysis(True, False).to_xml_element()
+    assert xmlAnalysis.attrib.get("calcCase") == "1"
+    assert xmlAnalysis.attrib.get("calcComb") == "0"
+    assert xmlAnalysis.find("comb") is None
+
+    xmlAnalysis = Analysis.FrequencyAnalysis().to_xml_element()
+    assert xmlAnalysis.attrib.get("calcFreq") == "1"
+    assert xmlAnalysis.find("comb") is None
+    assert xmlAnalysis.find("freq") is not None
+
+def test_cmd_proj_descr():
+    xmlCmdProjDescr = CmdProjDescr("Test project", "Test project description", "Test designer", "Test signature", "Comment", None).to_xml_element()
+
+    xmlCmdProjDescr.tag == "cmdprojdescr"
+
+    assert xmlCmdProjDescr.attrib.get("szProject") == "Test project"
+    assert xmlCmdProjDescr.attrib.get("szDescription") == "Test project description"
+    assert xmlCmdProjDescr.attrib.get("szDesigner") == "Test designer"
+    assert xmlCmdProjDescr.attrib.get("szSignature") == "Test signature"
+    assert xmlCmdProjDescr.attrib.get("szComment") == "Comment"
+
+    assert xmlCmdProjDescr.attrib.get("read") == "0"
+    assert xmlCmdProjDescr.attrib.get("reset") == "0"
+
+    assert xmlCmdProjDescr.find("item") is None
+
+    items = {"a": "a_txt", "b": "b_txt"}
+    xmlCmdProjDescr = CmdProjDescr(None, None, None, None, None, items, 0, 0).to_xml_element()
+
+    xmlCmdProjDescr.tag == "cmdprojdescr"
+
+    assert xmlCmdProjDescr.attrib.get("szProject") == None
+    assert xmlCmdProjDescr.attrib.get("szDescription") == None
+    assert xmlCmdProjDescr.attrib.get("szDesigner") == None
+    assert xmlCmdProjDescr.attrib.get("szSignature") == None
+    assert xmlCmdProjDescr.attrib.get("szComment") == None
+
+    assert xmlCmdProjDescr.attrib.get("read") == "0"
+    assert xmlCmdProjDescr.attrib.get("reset") == "0"
+
+    assert xmlCmdProjDescr.find("item") is not None
+    assert len( xmlCmdProjDescr.findall("item") ) == 2
+
+def test_cmd_listgen():
+    xmlCmdListGen = CmdListGen("bscfile.bsc", "outfile.csv", None, True, True, True).to_xml_element()
+
+    assert xmlCmdListGen.tag == "cmdlistgen"
+    assert xmlCmdListGen.attrib.get("bscfile") == os.path.join( os.getcwd(), "bscfile.bsc" )
+    assert xmlCmdListGen.attrib.get("outfile") == os.path.join( os.getcwd(), "outfile.csv" )
+    assert xmlCmdListGen.attrib.get("regional") == "1"
+    assert xmlCmdListGen.attrib.get("fillcells") == "1"
+    assert xmlCmdListGen.attrib.get("headers") == "1"
+    assert xmlCmdListGen.find("GUID") is None
+    assert len( xmlCmdListGen.findall("GUID") ) == 0
+
+
+    guids = [uuid.uuid4(), uuid.uuid4()]
+    xmlCmdListGen = CmdListGen("result.bsc", "outfile.csv", guids, False, False, False).to_xml_element()
+
+    assert xmlCmdListGen.tag == "cmdlistgen"
+    assert xmlCmdListGen.attrib.get("bscfile") == os.path.join( os.getcwd(), "result.bsc" )
+    assert xmlCmdListGen.attrib.get("outfile") == os.path.join( os.getcwd(), "outfile.csv" )
+    assert xmlCmdListGen.attrib.get("regional") == "0"
+    assert xmlCmdListGen.attrib.get("fillcells") == "0"
+    assert xmlCmdListGen.attrib.get("headers") == "0"
+    assert xmlCmdListGen.find("GUID") is not None
+    assert len( xmlCmdListGen.findall("GUID") ) == 2
+
+    xmlCmdListGen = CmdListGen("result.bsc").to_xml_element()
+
+    assert xmlCmdListGen.tag == "cmdlistgen"
+    assert xmlCmdListGen.attrib.get("bscfile") == os.path.join( os.getcwd(), "result.bsc" )
+    assert xmlCmdListGen.attrib.get("outfile") == os.path.join( os.getcwd(), "result.csv" )
+    assert xmlCmdListGen.attrib.get("regional") == "1"
+    assert xmlCmdListGen.attrib.get("fillcells") == "1"
+    assert xmlCmdListGen.attrib.get("headers") == "1"
+    assert xmlCmdListGen.find("GUID") is None
+    assert len( xmlCmdListGen.findall("GUID") ) == 0
+
+def test_cmd_config():
+    file_path = "config.xml"
+    xmlCmdConfig = CmdConfig(file_path).to_xml_element()
+
+    assert xmlCmdConfig.tag == "cmdconfig"
+    assert xmlCmdConfig.attrib.get("file") == os.path.join( os.getcwd(), file_path )
+
+def test_cmd_interaction_surface():
+    guid = uuid.uuid4()
+    
+    xmlCmdInteractionSurface = CmdInteractionSurface(guid, "surface.txt", 0.0, False).to_xml_element()
+
+    assert xmlCmdInteractionSurface.tag == "cmdinteractionsurface"
+    assert xmlCmdInteractionSurface.attrib.get("guid") == str(guid)
+    assert xmlCmdInteractionSurface.attrib.get("outfile") == os.path.join( os.getcwd(), "surface.txt" )
+    assert xmlCmdInteractionSurface.attrib.get("offset") == "0.0"
+    assert xmlCmdInteractionSurface.attrib.get("fUlt") == "false"
+
+    xmlCmdInteractionSurface = CmdInteractionSurface(guid, "surface.txt", 5.2, True).to_xml_element()
+
+    assert xmlCmdInteractionSurface.tag == "cmdinteractionsurface"
+    assert xmlCmdInteractionSurface.attrib.get("guid") == str(guid)
+    assert xmlCmdInteractionSurface.attrib.get("outfile") == os.path.join( os.getcwd(), "surface.txt" )
+    assert xmlCmdInteractionSurface.attrib.get("offset") == "5.2"
+    assert xmlCmdInteractionSurface.attrib.get("fUlt") == "true"

fem_design-0.0.8/test/test_pipe.py

@@ -0,0 +1,37 @@
+from femdesign.calculate.command import *
+from femdesign.calculate.analysis import Analysis, CombSettings, Design
+from femdesign.comunication import FemDesignConnection
+import pytest
+
+def test_pipe():
+    connection = FemDesignConnection(output_dir="test", minimized=True)
+    assert connection.output_dir == os.path.join( os.getcwd(), "test" )
+
+    connection._output_dir = None
+    assert connection.output_dir == os.path.join( os.getcwd(), "FEM-Design API" )
+
+    ## assert that connection.open() raises an error
+    try:
+        connection.Open("myModel.str")
+    except Exception as e:
+        assert isinstance(e, FileNotFoundError)
+        assert str(e) == "File myModel.str not found"
+
+    try:
+        connection.Open("myModel.3dm")
+    except Exception as e:
+        assert isinstance(e, ValueError)
+        assert str(e) == "file_name must have extension .struxml or .str"
+
+    connection.__exit__()
+
+def test_interaction_surface():
+    connection = FemDesignConnection(minimized=True)
+    connection.Open(r"test/assets/concrete_beam.struxml")
+    guid = "c71d1619-420a-46fe-bbb7-423bf20fdcda"
+    connection.GenerateInteractionSurface(guid, "test/assets/interaction_surface.txt", 0.5, True)
+
+    assert os.path.exists("test/assets/interaction_surface.txt")
+    assert os.path.getsize("test/assets/interaction_surface.txt") > 0
+
+    os.remove("test/assets/interaction_surface.txt")

fem_design-0.0.6/src/FEM_Design.egg-info/SOURCES.txt

@@ -1,16 +0,0 @@
-LICENSE
-README.md
-pyproject.toml
-src/FEM_Design.egg-info/PKG-INFO
-src/FEM_Design.egg-info/SOURCES.txt
-src/FEM_Design.egg-info/dependency_links.txt
-src/FEM_Design.egg-info/top_level.txt
-src/femdesign/__init__.py
-src/femdesign/comunication.py
-src/femdesign/database.py
-src/femdesign/calculate/__init__.py
-src/femdesign/calculate/analysis.py
-src/femdesign/calculate/command.py
-src/femdesign/calculate/fdscript.py
-src/femdesign/utilities/__init__.py
-src/femdesign/utilities/filehelper.py

fem_design-0.0.6/src/femdesign/__init__.py

@@ -1 +0,0 @@
-version = "0.0.6"

fem_design-0.0.6/src/femdesign/database.py

@@ -1,63 +0,0 @@
-import xml.etree.ElementTree as ET
-import uuid
-import datetime
-
-namespace = {'': 'urn:strusoft'}
-
-class Database:
-    def __init__(self, country):
-        self.struxml_version = "01.00.000"
-        self.source_software = f"FEM-Design API SDK {self.get_version()}"
-        self.start_time = "1970-01-01T00:00:00.000"
-        self.end_time = datetime.datetime.now(datetime.UTC).strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3]
-        self.guid = str(uuid.uuid4())
-        self.convert_id = "00000000-0000-0000-0000-000000000000"
-        self.standard = "EC"
-        self.country = country
-        self.end = ""
-
-    def get_version(self):
-        return "0.1.0"
-
-    @property
-    def eurocode(self):
-        return self._root.attrib["standard"]
-    
-    @property
-    def country(self):
-        return self._root.attrib["country"]
-
-    @property
-    def source_software(self):
-        return self._root.attrib["source_software"]
-    
-    @property
-    def entities(self):
-        return self._root.findall(".//entities", namespace)
-    
-    @property
-    def sections(self):
-        return self._root.findall(".//sections", namespace)
-
-    @property
-    def materials(self):
-        return self._root.findall(".//materials", namespace)
-
-    @property
-    def bars(self):
-        return self._root.findall(".//bar", namespace)
-    
-    def serialise_to_xml(self):
-        return ET.tostring(self._root, encoding="UTF-8")
-    
-        #     private void Initialize(Country country)
-        # {
-        #     this.StruxmlVersion = "01.00.000";
-        #     this.SourceSoftware = $"FEM-Design API SDK {Assembly.GetExecutingAssembly().GetName().Version.ToString()}";
-        #     this.StartTime = "1970-01-01T00:00:00.000";
-        #     this.EndTime = System.DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ss.fff", CultureInfo.InvariantCulture);
-        #     this.Guid = System.Guid.NewGuid();
-        #     this.ConvertId = "00000000-0000-0000-0000-000000000000";
-        #     this.Standard = "EC";
-        #     this.Country = country;
-        #     this.End = "";