pilot.linkstec 0.0.103__tar.gz → 0.0.105__tar.gz

{pilot_linkstec-0.0.103 → pilot_linkstec-0.0.105}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pilot.linkstec
-Version: 0.0.103
+Version: 0.0.105
 Summary: pilot of the ship, a tool for managing and deploying Python projects.
 Author-email: wanglr <wanglr1980@gmail.com>
 License-Expression: MIT

{pilot_linkstec-0.0.103 → pilot_linkstec-0.0.105}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pilot.linkstec"
-version = "0.0.103"
+version = "0.0.105"
 authors = [
   { name="wanglr", email="wanglr1980@gmail.com" },
 ]

{pilot_linkstec-0.0.103 → pilot_linkstec-0.0.105}/src/pilot/base/file_operation.py

@@ -5,14 +5,13 @@ from pathlib import Path
 from typing import List, Dict, Any
 from venv import logger
 
-from base.get_file_encoding import get_file_encoding
 
 #
 def read_file_lines(file_path):
     if not os.path.exists(file_path):
         logger.error(f"ファイルが存在しない。{file_path}")
         return None
-    file_encoding = get_file_encoding(file_path)
+    file_encoding = 'utf-8'
     with open(file_path, 'r', encoding=file_encoding) as f:
         _lines = f.readlines()
     return _lines
@@ -22,7 +21,7 @@ def read_json_file_lines(json_file_path):
         logger.error(f"JSONファイルが存在しない。{json_file_path}")
         return None
 
-    json_file_encoding = get_file_encoding(json_file_path)
+    json_file_encoding = 'utf-8'
     with open(json_file_path, 'r', encoding=json_file_encoding) as fp:
         return json.load(fp)  # -> List[Dict]
 

{pilot_linkstec-0.0.103 → pilot_linkstec-0.0.105}/src/pilot/create_python/create_python.py

@@ -34,10 +34,10 @@ def generate_code():
     print('Main Unitファイルを作成する')
     sample_unit_file_path = os.path.join(cwd, 'sample', 'child_sample', 'unit.txt')
     replacements_unit = {
-        "JOB_PACKAGE": 'src.'+ config_dto.sub_project_name + '.'+ config_dto.sub_source_folder + '.' + config_dto.sub_sub_source_folder_1 + '.' + os.path.basename(target_project_sub_job_path).split('.')[0],
-        "GYOMU_JOB_PACKAGE_000": 'src.'+ config_dto.sub_project_name + '.' + config_dto.sub_source_folder + '.' + config_dto.sub_sub_source_folder_1 + '.jobs.job_000',
-        "GYOMU_JOB_PACKAGE_001": 'src.' + config_dto.sub_project_name + '.' + config_dto.sub_source_folder + '.' + config_dto.sub_sub_source_folder_1 + '.jobs.job_001',
-        "GYOMU_JOB_PACKAGE_002": 'src.' + config_dto.sub_project_name + '.' + config_dto.sub_source_folder + '.' + config_dto.sub_sub_source_folder_1 + '.jobs.job_002'
+        "JOB_PACKAGE":  config_dto.sub_project_name + '.'+ config_dto.sub_source_folder + '.' + config_dto.sub_sub_source_folder_1 + '.' + os.path.basename(target_project_sub_job_path).split('.')[0],
+        "GYOMU_JOB_PACKAGE_000":  config_dto.sub_project_name + '.' + config_dto.sub_source_folder + '.' + config_dto.sub_sub_source_folder_1 + '.jobs.job_000',
+        "GYOMU_JOB_PACKAGE_001":  config_dto.sub_project_name + '.' + config_dto.sub_source_folder + '.' + config_dto.sub_sub_source_folder_1 + '.jobs.job_001',
+        "GYOMU_JOB_PACKAGE_002":  config_dto.sub_project_name + '.' + config_dto.sub_source_folder + '.' + config_dto.sub_sub_source_folder_1 + '.jobs.job_002'
     }
     target_project_unit_path = os.path.join(target_project_sub_project_path, config_dto.sub_source_folder + '_' + config_dto.sub_sub_source_folder_1 + '_unit.py' )
     read_replace_create_file(sample_unit_file_path, replacements_unit, Path(target_project_unit_path))
@@ -45,7 +45,7 @@ def generate_code():
     print('Main Controllerファイルを作成する')
     sample_controller_file_path = os.path.join(cwd, 'sample', 'child_sample', 'controller.txt')
     replacements_control = {
-        "UNIT_PACKAGE": 'src.'+ config_dto.sub_project_name + '.'+ config_dto.sub_source_folder + '.'+ config_dto.sub_sub_source_folder_1 + '.' + os.path.basename(target_project_unit_path).split('.')[0]
+        "UNIT_PACKAGE": config_dto.sub_project_name + '.'+ config_dto.sub_source_folder + '.'+ config_dto.sub_sub_source_folder_1 + '.' + os.path.basename(target_project_unit_path).split('.')[0]
     }
     target_project_sub_controller_path = os.path.join(target_project_sub_project_path, config_dto.sub_source_folder + '_' + config_dto.sub_sub_source_folder_1 + '_control.py')
     read_replace_create_file(sample_controller_file_path, replacements_control, Path(target_project_sub_controller_path))
@@ -59,7 +59,7 @@ def generate_code():
     sample_job000_file_path = os.path.join(cwd, 'sample', 'child_sample', 'job' ,'job_000.txt')
     sample_job_sample_file_path = os.path.join(cwd, 'sample', 'child_sample', 'job', 'job_sample.txt')
     replacements_job000 = {
-        'JOB_PACKAGE': 'src.'+ config_dto.sub_project_name + '.'+ config_dto.sub_source_folder + '.' + config_dto.sub_sub_source_folder_1 + '.'  + os.path.basename(target_project_sub_job_path).split('.')[0]
+        'JOB_PACKAGE': config_dto.sub_project_name + '.'+ config_dto.sub_source_folder + '.' + config_dto.sub_sub_source_folder_1 + '.'  + os.path.basename(target_project_sub_job_path).split('.')[0]
     }
     target_project_job000_path = os.path.join(target_project_sub_project_path, 'jobs','job_000.py')
     target_project_job001_path = os.path.join(target_project_sub_project_path, 'jobs','job_001.py')
@@ -67,12 +67,12 @@ def generate_code():
     read_replace_create_file(sample_job000_file_path, replacements_job000, Path(target_project_job000_path))
     replacements_job001 = {
         'JOB_NAME':'Job_001',
-        'JOB_PACKAGE': 'src.'+ config_dto.sub_project_name + '.'+ config_dto.sub_source_folder + '.' + config_dto.sub_sub_source_folder_1 + '.'  + os.path.basename(target_project_sub_job_path).split('.')[0]
+        'JOB_PACKAGE': config_dto.sub_project_name + '.'+ config_dto.sub_source_folder + '.' + config_dto.sub_sub_source_folder_1 + '.'  + os.path.basename(target_project_sub_job_path).split('.')[0]
     }
     read_replace_create_file(sample_job_sample_file_path, replacements_job001, Path(target_project_job001_path))
     replacements_job002 = {
         'JOB_NAME': 'Job_002',
-        'JOB_PACKAGE': 'src.'+ config_dto.sub_project_name + '.'+ config_dto.sub_source_folder + '.' + config_dto.sub_sub_source_folder_1 + '.'  + os.path.basename(target_project_sub_job_path).split('.')[0]
+        'JOB_PACKAGE': config_dto.sub_project_name + '.'+ config_dto.sub_source_folder + '.' + config_dto.sub_sub_source_folder_1 + '.'  + os.path.basename(target_project_sub_job_path).split('.')[0]
     }
     read_replace_create_file(sample_job_sample_file_path, replacements_job002, Path(target_project_job002_path))
 
@@ -84,7 +84,7 @@ def generate_code():
     sample_main_controller_file_path = os.path.join(cwd, 'sample', 'main_convert.txt')
     # パラメーター
     replacements = {
-        "CONTROLLER_PACKAGE": 'src.'+ config_dto.sub_project_name + '.' + config_dto.sub_source_folder + '.' + config_dto.sub_sub_source_folder_1 +'.' + os.path.basename(target_project_sub_controller_path).split('.')[0],
+        "CONTROLLER_PACKAGE": config_dto.sub_project_name + '.' + config_dto.sub_source_folder + '.' + config_dto.sub_sub_source_folder_1 +'.' + os.path.basename(target_project_sub_controller_path).split('.')[0],
         "PYTHON_CONFIG_PROPERTIES": config_dto.sub_project_name + '_' + config_dto.sub_source_folder + '_' + config_dto.sub_sub_source_folder_1 + '.properties'
     }
     # 目標ファイルパス

{pilot_linkstec-0.0.103 → pilot_linkstec-0.0.105}/src/pilot/job/impl/base_job.py

@@ -75,6 +75,11 @@ class BaseJob(JobInterface):
                 self._content = f.read()
         return self._content
 
+    def read_file_lines(self):
+        with open(self.file_path, 'r', encoding='utf-8') as f:
+            _lines = f.readlines()
+        return _lines
+
     def get_current_step_relative_path(self):
         if not self._file_path:
             return self._file_path
@@ -355,3 +360,6 @@ class BaseJob(JobInterface):
 
     def get_file_name_without_extension(self, file_name):
         return os.path.splitext(os.path.basename(file_name))[0]
+
+
+

{pilot_linkstec-0.0.103 → pilot_linkstec-0.0.105}/src/pilot.linkstec.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pilot.linkstec
-Version: 0.0.103
+Version: 0.0.105
 Summary: pilot of the ship, a tool for managing and deploying Python projects.
 Author-email: wanglr <wanglr1980@gmail.com>
 License-Expression: MIT