cannect 1.0.0__tar.gz → 1.0.2__tar.gz

{cannect-1.0.0/src/cannect.egg-info → cannect-1.0.2}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: cannect
-Version: 1.0.0
+Version: 1.0.2
 Summary: HYUNDAI-KEFICO EMS/ASW CONVENIENCE TOOL
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: kaleido

{cannect-1.0.0 → cannect-1.0.2}/pyproject.toml

@@ -4,10 +4,10 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cannect"
-version = "1.0.0"
+version = "1.0.2"
 description = "HYUNDAI-KEFICO EMS/ASW CONVENIENCE TOOL"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 dependencies = [
     "kaleido",
     "lxml",

{cannect-1.0.0 → cannect-1.0.2}/src/cannect/__init__.py

@@ -1,11 +1,13 @@
 __all__ = [
+    "env",
+    "mount",
 
     # .core
     "Ascet",
-    "AscetCAN",
-    "DataBaseCAN",
-    "IR",
+    "AscetCAN", "DataBaseCAN",
+    "IntegrationRequest", "ChangeHistoryManager",
     "Subversion",
+    "TestCase", "TestCasePlot", "TestCaseUnit",
 
     # .utils
     "ComExcel",
@@ -16,15 +18,14 @@ __all__ = [
     "DataDictionary",
 ]
 
-from cannect.config import mount
+from cannect.config import env, mount
 from cannect.core import ascet as Ascet
 from cannect.core.can import AscetCAN, DataBaseCAN
+from cannect.core.ir import IntegrationRequest, ChangeHistoryManager
 from cannect.core.subversion import Subversion
-from cannect.core.testcase import TestCase, UnitTestCase, Plot
-from cannect.core.ir import IR
-from cannect.core.ir.changehistory import ChangeHistoryManager
-
+from cannect.core.testcase import TestCase, TestCasePlot, TestCaseUnit
 from cannect.schema import DataDictionary
-
 from cannect.utils import ComExcel, Logger
 from cannect.utils import tools as Tools
+
+mount()

{cannect-1.0.0 → cannect-1.0.2}/src/cannect/config.py

@@ -55,7 +55,7 @@ def mount(svn_path=None):
         E.get('USERDOMAIN', '') == 'HKEFICO' and
         E.get('USERDOMAIN_ROAMINGPROFILE', '') == 'HKEFICO'
     ):
-        raise PermissionError(f'USER: {e.get("USERNAME")} NOT AUTHORIZED')
+        raise PermissionError(f'USER: {E.get("USERNAME")} NOT AUTHORIZED')
 
     # 전역 환경 변수 설정
     E.DOWNLOADS   = E.USERPROFILE / 'Downloads'
@@ -65,7 +65,7 @@ def mount(svn_path=None):
     E.SVN_CONF    = svn_path / 'GSL_Build/1_AswCode_SVN/PostAppSW/0_XML/DEM_Rename'
     E.SVN_HISTORY = svn_path / 'GSL_Release/4_SW변경이력'
     E.SVN_IR      = svn_path / 'GSL_Build/8_IntegrationRequest'
-    E.SVN_MODEL   = svn_path / 'model/ascet/trunk'
+    E.SVN_MODEL   = svn_path / 'model'
     E.SVN_UNECE   = svn_path / 'Autron_CoWork/사이버보안/Module_Test_Results'
     E.SVN_SDD     = svn_path / 'GSL_Build/7_Notes'
     for p in psutil.disk_partitions():
@@ -79,26 +79,8 @@ def mount(svn_path=None):
         if key.startswith("SVN"):
             if not path.exists():
                 raise InternalServerError(f"{{{path}}} NOT EXIST IN {E.COMPANY} SERVER")
-            
-    # 접근 권한 2차 확인; SVN 권한 확인
-    for path in [
-        E.SVN_CAN,
-        E.SVN_CONF,
-        E.SVN_HISTORY,
-        E.SVN_IR,
-        E.SVN_MODEL,
-        E.SVN_UNECE,
-        E.SVN_SDD
-    ]:
-        if not (path / ".svn").is_dir():
-            raise InternalServerError(f"{{{path}}} IS NOT LINKED TO SVN")
-    return
 
-# Initialize
-if E.USERNAME == '22011148':
-    mount(svn_path=Path(r"E:\SVN"))
-else:
-    mount()
+    return
 
 
 if __name__ == "__main__":

cannect-1.0.2/src/cannect/core/ascet/__init__.py

@@ -0,0 +1,7 @@
+__all__ = [
+    "Amd",
+    "AmdIO",
+    "WorkspaceIO"
+]
+from .amd import Amd, AmdIO
+from .ws import WorkspaceIO

{cannect-1.0.0 → cannect-1.0.2}/src/cannect/core/ascet/ws.py

@@ -1,4 +1,4 @@
-from cannect.core.ascet import AmdIO, AmdSC
+from cannect.core.ascet.amd import AmdIO, AmdSC
 from cannect.core.subversion import Subversion
 from cannect.config import env
 from cannect.errors import AscetWorspaceFormatError, AmdDuplicationError, AmdNotFoundError
@@ -12,19 +12,22 @@ class WorkspaceIO:
 
     def __init__(self, path:str=""):
         self.path = path = env.SVN_MODEL if not path else Path(path)
-
-        listdir = os.listdir(path)
-        if not "HNB_GASOLINE" in listdir:
-            raise AscetWorspaceFormatError('NO {HNB_GASOLINE} IN WORKSPACE DIRECTORY')
-        if not "HMC_ECU_Library" in listdir:
-            raise AscetWorspaceFormatError('NO {HMC_ECU_Library} IN WORKSPACE DIRECTORY')
-
-        fdb = ''
-        if '.svn' in listdir:
-            fdb = Path(path) / '.svn/wc.db'
-        for f in listdir:
-            if f.endswith('.aws'):
-                fdb = Path(path) / f
+        if path != env.SVN_MODEL:
+            listdir = os.listdir(path)
+            if not "HNB_GASOLINE" in listdir:
+                raise AscetWorspaceFormatError('NO {HNB_GASOLINE} IN WORKSPACE DIRECTORY')
+            if not "HMC_ECU_Library" in listdir:
+                raise AscetWorspaceFormatError('NO {HMC_ECU_Library} IN WORKSPACE DIRECTORY')
+
+        if path == env.SVN_MODEL:
+            fdb = r'\\kefico\keti\ENT\SDT\SVN\model\.svn\wc.db'
+        else:
+            fdb = ''
+            if '.svn' in listdir:
+                fdb = Path(path) / '.svn/wc.db'
+            for f in listdir:
+                if f.endswith('.aws'):
+                    fdb = Path(path) / f
 
         if not fdb:
             raise AscetWorspaceFormatError('NO .aws OR wc.db IN WORKSPACE DIRECTORY')
@@ -145,6 +148,7 @@ if __name__ == "__main__":
 
 
     io = WorkspaceIO()
+    print(io.db)
     print(io["CanHSFPCMD"])
     # print(io.bcPath(33))
     # print(io.bcTree(33))

cannect-1.0.2/src/cannect/core/can/__init__.py

@@ -0,0 +1,6 @@
+__all__ = [
+    "AscetCAN",
+    "DataBaseCAN"
+]
+from . import ascet as AscetCAN
+from . import db as DataBaseCAN

cannect-1.0.2/src/cannect/core/can/ascet/__init__.py

@@ -0,0 +1,8 @@
+__all__ = [
+    "ComDef",
+    "ComDiag",
+    "ComRx",
+]
+from .diag import CANDiag as ComDiag
+from .comrx import ComRx
+from .comdef import ComDef

{cannect-1.0.0 → cannect-1.0.2}/src/cannect/core/can/ascet/_db2elem.py

@@ -13,8 +13,7 @@ from xml.etree.ElementTree import Element
 import math
 
 
-F = formula_dictionary(env.SVN_CAN / "CAN_Model/Formula/HNB_I4GDI_I4MPI.xml")
-
+F = None
 def elementWrapper(**kwargs) -> DataDictionary:
     return DataDictionary(
         kwargs=DataDictionary(**kwargs),
@@ -71,6 +70,10 @@ def crcClassElement(n:Union[int, str], oid_tag:Optional[Dict[str, str]]=None) ->
 
 
 def SignalElement(signal:CanSignal, oid_tag:Optional[Dict[str, str]]=None) -> DataDictionary:
+    global F
+    if F is None:
+        F = formula_dictionary(env.SVN_CAN / "CAN_Model/Formula/HNB_I4GDI_I4MPI.xml")
+
     if not oid_tag:
         oid_tag = {}
     kwargs = DataDictionary()

{cannect-1.0.0 → cannect-1.0.2}/src/cannect/core/can/ascet/comdef.py

@@ -1,5 +1,6 @@
 from cannect.config import env
 from cannect.core.ascet.amd import Amd
+from cannect.core.ascet.ws import WorkspaceIO
 from cannect.core.can.ascet import _db2code, _db2elem
 from cannect.core.can.db.reader import CANDBReader
 from cannect.schema.datadictionary import DataDictionary
@@ -31,7 +32,7 @@ class ComDef:
             name = os.path.basename(base_model).split(".")[0]
         else:
             name = f"ComDef{'_HEV' if engine_spec == 'HEV' else ''}"
-            base_model = env.SVN_MODEL / rf'HNB_GASOLINE/_29_CommunicationVehicle/StandardDB/NetworkDefinition/{name}/{name}.zip'
+            base_model = WorkspaceIO()[name]
 
         # 공용 속성 생성
         self.db = db
@@ -76,7 +77,7 @@ class ComDef:
         logger.end(">>> Defining Signal Elements...")
         return
 
-    def autorun(self):
+    def generate(self):
         self.main.find('Component/Comment').text = _db2code.INFO(self.db.revision)
         self.define_elements('MethodSignature')
         self.define_elements('Element')
@@ -245,7 +246,7 @@ if __name__ == "__main__":
     #     # base_model=r'D:\SVN\model\ascet\trunk\HNB_GASOLINE\_29_CommunicationVehicle\StandardDB\NetworkDefinition\ComDef\ComDef-22368\ComDef.main.amd'
     #     # base_model=ENV['ASCET_EXPORT_PATH']
     # )
-    # model.autorun()
+    # model.generate()
 
     model = ComDef(
         db=db,
@@ -253,4 +254,4 @@ if __name__ == "__main__":
         exclude_tsw=True,
         # base_model=env.ASCET / f"Export/ComDef_G/ComDef_G.main.amd"
     )
-    model.autorun()
+    model.generate()

{cannect-1.0.0 → cannect-1.0.2}/src/cannect/core/can/ascet/comrx.py

@@ -1,5 +1,6 @@
 from cannect.config import env
 from cannect.core.ascet.amd import Amd
+from cannect.core.ascet.ws import WorkspaceIO
 from cannect.core.can.ascet._db2code import MessageCode
 from cannect.core.can.db.reader import CANDBReader
 from cannect.utils.logger import Logger
@@ -29,7 +30,7 @@ class ComRx:
             name = os.path.basename(base_model).split(".")[0]
         else:
             name = f"ComRx{'_HEV' if engine_spec == 'HEV' else ''}"
-            base_model = env.SVN_MODEL / rf'HNB_GASOLINE/_29_CommunicationVehicle/StandardDB/MessageInterface/MessageReceive/{name}/{name}.zip'
+            base_model = WorkspaceIO()[name]
         host = name.replace("Rx", "Def")
 
         # 공용 속성 생성
@@ -99,7 +100,7 @@ class ComRx:
             method.find('CodeBlock').text = curr.get(name, "")
         return
 
-    def export(self):
+    def generate(self):
         self.main.export_to_downloads()
         self.impl.export_to_downloads()
         self.data.export_to_downloads()
@@ -136,4 +137,4 @@ if __name__ == "__main__":
         # base_model="",
         # base_model=env.ASCET / f"Export/ComRx_G/ComRx_G.main.amd"
     )
-    model.export()
+    model.generate()

{cannect-1.0.0 → cannect-1.0.2}/src/cannect/core/can/ascet/diag.py

@@ -1,6 +1,7 @@
 from cannect.config import env
 from cannect.core.ascet.amd import Amd
 from cannect.core.ascet.oid import generateOID
+from cannect.core.ascet.ws import WorkspaceIO
 from cannect.core.can.db.reader import CANDBReader
 from cannect.core.can.ascet._db2code import INFO
 from cannect.core.can.rule import naming
@@ -25,7 +26,7 @@ class CANDiag(Amd):
         template = env.SVN_CAN / "CAN_Model/_29_CommunicationVehicle/StandardDB/StandardTemplate/CANDiagTmplt/CANDiagTmplt.main.amd"
         super().__init__(str(template))
 
-        self.dsm = env.SVN_MODEL / "HMC_ECU_Library/HMC_DiagLibrary/DSM_Types"
+        self.ws = WorkspaceIO()
 
         # LOGGER 생성
         base = Amd(src)
@@ -481,9 +482,9 @@ CHANNEL     : {db[f'{self.hw} Channel']}-CAN
         return
 
     def copy_dsm(self):
-        fid_md = Amd(os.path.join(self.dsm, "Fid_Typ.zip"))
+        fid_md = Amd(self.ws["Fid_Typ.zip"])
         fid = fid_md.impl.dataframe("ImplementationSet", depth="shallow").set_index("name")["OID"]
-        deve_md = Amd(os.path.join(self.dsm, "DEve_Typ.zip"))
+        deve_md = Amd(self.ws["DEve_Typ.zip"])
         deve = deve_md.impl.dataframe("ImplementationSet", depth="shallow").set_index("name")["OID"]
 
         for elem in self.impl.iter('ElementImplementation'):
@@ -587,7 +588,7 @@ CHANNEL     : {db[f'{self.hw} Channel']}-CAN
             self.logger(f'>>> ... NO EXCEPTION FOUND')
         return
 
-    def create(self, path:str=''):
+    def generate(self, path:str=''):
 
         # BASE 모델의 기본 정보들을 CANDiag으로 복사
         self.logger('>>> COPY BASE MODEL TO TEMPLATE')
@@ -684,8 +685,8 @@ if __name__ == "__main__":
     proj = WorkspaceIO()
     data = CANDBReader().to_developer_mode("HEV")
 
-    template = CANDiag(data, proj["CanFDMCU_HEV"], "MCU_01_P_10ms", "MCU_01_H_10ms", "MCU_02_P_10ms", "MCU_02_H_10ms")
-    template.create()
+    template = CANDiag(data, proj["CanFDMCUD_HEV"], "MCU_01_P_10ms", "MCU_01_H_10ms", "MCU_02_P_10ms", "MCU_02_H_10ms", "MCU_03_100ms")
+    template.generate()
 
 
 

cannect-1.0.2/src/cannect/core/can/db/__init__.py

@@ -0,0 +1,10 @@
+__all__ = [
+    "Reader",
+    "Specification",
+    "SCHEMA",
+    "VersionControl"
+]
+from .reader import CANDBReader as Reader
+from .schema import SCHEMA
+from .vcs import CANDBVcs as VersionControl
+from .specification.wrapper import Specification

{cannect-1.0.0 → cannect-1.0.2}/src/cannect/core/can/db/vcs.py

@@ -3,6 +3,7 @@ from cannect.core.can.db.schema import standardize
 from cannect.core.subversion import Subversion
 from cannect.errors import CANDBError
 from cannect.utils.excel import ComExcel
+from cannect.utils.tools import path_abbreviate
 
 from datetime import datetime
 from pandas import DataFrame
@@ -86,7 +87,7 @@ class CANDBVcs:
         source.to_json(jsonpath, orient='index')
         if not self.silence:
             self.logger("Manually Updated CAN DB from clipboard.")
-            self.logger(f"- Saved as : {jsonpath}")
+            self.logger(f"- Saved as : {path_abbreviate(jsonpath)}")
         return
 
     # def commit_json(self):

cannect-1.0.2/src/cannect/core/ir/__init__.py

@@ -0,0 +1,6 @@
+__all__ = [
+    "ChangeHistoryManager",
+    "IntegrationRequest"
+]
+from .ir import IntegrationRequest
+from .changehistory import ChangeHistoryManager

{cannect-1.0.0 → cannect-1.0.2}/src/cannect/core/ir/ir.py

@@ -355,7 +355,7 @@ class IntegrationRequest:
         for n, row in enumerate(self):
             self.logger.hold(f">>> %{row['FunctionName']: <{self._space}} ")
             if col == '' or col == 'SCMName':
-                self.table.loc[n, 'SCMRev'] = _get_log(env.SVN_MODEL / f'{row["SCMName"]}.zip')
+                self.table.loc[n, 'SCMRev'] = _get_log(env.SVN_MODEL / f'ascet/trunk/{row["SCMName"]}.zip')
             if col == '' or col == 'DSMName':
                 if pd.isna(row["DSMName"]) or (row["DSMName"] == ''):
                     self.logger.hold(f'|{" " * (self._space + 13 + 11)}')

cannect-1.0.2/src/cannect/core/testcase/__init__.py

@@ -0,0 +1,8 @@
+__all__ = [
+    "TestCase",
+    "TestCasePlot",
+    "TestCaseUnit"
+]
+from .plotter import Plot as TestCasePlot
+from .testcase import TestCase
+from .unitcase import UnitTestCase as TestCaseUnit

{cannect-1.0.0 → cannect-1.0.2}/src/cannect/utils/tools.py

@@ -18,8 +18,8 @@ def unzip(src: Union[str, Path], to: Union[str, Path] = "") -> bool:
         os.makedirs(to, exist_ok=True)
 
     src = str(src)
-    if not os.path.isfile(src):
-        raise KeyError(f"src: {src}는 경로가 포함된 파일(Full-Directory)이어야 합니다.")
+    # if not os.path.isfile(src):
+    #     raise KeyError(f"src: {src}는 경로가 포함된 파일(Full-Directory)이어야 합니다.")
     if src.endswith('.zip'):
         zip_obj = zipfile.ZipFile(src)
         zip_obj.extractall(to)

{cannect-1.0.0 → cannect-1.0.2/src/cannect.egg-info}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: cannect
-Version: 1.0.0
+Version: 1.0.2
 Summary: HYUNDAI-KEFICO EMS/ASW CONVENIENCE TOOL
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: kaleido

cannect-1.0.0/src/cannect/core/ascet/__init__.py

@@ -1,3 +0,0 @@
-from .amd import Amd, AmdIO, AmdEL, AmdSC
-from .oid import generateOID
-from .ws import WorkspaceIO

cannect-1.0.0/src/cannect/core/can/__init__.py

@@ -1,2 +0,0 @@
-from . import ascet as AscetCAN
-from . import db as DataBaseCAN

cannect-1.0.0/src/cannect/core/can/ascet/__init__.py

@@ -1,3 +0,0 @@
-from .diag import CANDiag as ComDiag
-from .comrx import ComRx
-from .comdef import ComDef

cannect-1.0.0/src/cannect/core/can/db/__init__.py

@@ -1,4 +0,0 @@
-from .reader import CANDBReader as Reader
-from .schema import SCHEMA, toJSpreadSheet, standardize
-from .vcs import CANDBVcs as VCS
-from .specification.wrapper import Specification

cannect-1.0.0/src/cannect/core/ir/__init__.py

@@ -1,2 +0,0 @@
-from .ir import IntegrationRequest as IR
-from .changehistory import ChangeHistoryManager

cannect-1.0.0/src/cannect/core/testcase/__init__.py

@@ -1,3 +0,0 @@
-from .testcase import TestCase
-from .unitcase import UnitTestCase
-from .plotter import Plot