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

{fem_design-0.0.7/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.7
+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/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
 
 
 

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.7 → 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.7
+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/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
 
 
 

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

@@ -298,7 +298,7 @@ class Verbosity(Enum):
 
 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,

{fem_design-0.0.7 → 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.7"
+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/tree/master/FemDesign.Python"
-Issues = "https://github.com/strusoft/femdesign-api/issues"
+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.7/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.7/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 = "";