ScriptCollection 3.5.165__py3-none-any.whl → 4.0.11__py3-none-any.whl

ScriptCollection/CertificateUpdater.py

@@ -94,7 +94,7 @@ class CertificateUpdater:
             try:
                 GeneralUtilities.write_message_to_stdout(GeneralUtilities.get_line())
                 GeneralUtilities.write_message_to_stdout(f"Process domain {domain}")
-                self.__sc.run_program("docker", f"container rm {certbot_container_name}", self.__current_folder, throw_exception_if_exitcode_is_not_zero=False, verbosity=0)
+                self.__sc.run_program("docker", f"container rm {certbot_container_name}", self.__current_folder, throw_exception_if_exitcode_is_not_zero=False)
                 certificate_for_domain_already_exists = os.path.isfile(f"{self.__letsencrypt_folder}/renewal/{domain}.conf")
                 if certificate_for_domain_already_exists:
                     GeneralUtilities.write_message_to_stdout(f"Update certificate for domain {domain}")

ScriptCollection/Executables.py

@@ -3,14 +3,15 @@ import os
 import argparse
 import time
 import traceback
-import sys
+#import sys
 import shutil
 import keyboard
-from .TasksForCommonProjectStructure import TasksForCommonProjectStructure
 from .ScriptCollectionCore import ScriptCollectionCore
 from .GeneralUtilities import GeneralUtilities
+from .SCLog import LogLevel
 from .ImageUpdater import ImageUpdater, VersionEcholon
-
+from .TFCPS.TFCPS_CodeUnit_BuildCodeUnits import TFCPS_CodeUnit_BuildCodeUnits
+from .TFCPS.TFCPS_Tools_General import TFCPS_Tools_General
 
 def FilenameObfuscator() -> int:
     parser = argparse.ArgumentParser(description=''''Obfuscates the names of all files in the given folder.
@@ -259,37 +260,79 @@ def HealthCheck() -> int:
 def BuildCodeUnit() -> int:
     parser = argparse.ArgumentParser()
     parser.add_argument('--codeunitfolder', required=False, default=".")
-    parser.add_argument('-v', '--verbosity', required=False, default=1)
+    verbosity_values = ", ".join(f"{lvl.value}={lvl.name}" for lvl in LogLevel)
+    parser.add_argument('-v', '--verbosity', required=False, default=3, help=f"Sets the loglevel. Possible values: {verbosity_values}")
     parser.add_argument('--targetenvironment', required=False, default="QualityCheck")
     parser.add_argument('--additionalargumentsfile', required=False, default=None)
     parser.add_argument('--assume_dependent_codeunits_are_already_built', type=GeneralUtilities.string_to_boolean, const=True, default=False, nargs='?')
-    args = parser.parse_args()
-    TasksForCommonProjectStructure().build_codeunit(args.codeunitfolder, int(args.verbosity), args.targetenvironment, args.additionalargumentsfile, False, None, args.assume_dependent_codeunits_are_already_built, sys.argv)
-    return 0
+    #args = parser.parse_args()
+    #t=TasksForCommonProjectStructure(args)
+    #t.build_codeunit(args.codeunitfolder,  args.targetenvironment, args.additionalargumentsfile, False, None, args.assume_dependent_codeunits_are_already_built, sys.argv)
+    #return 0
+    return 1#TODO
 
 
 def BuildCodeUnits() -> int:
     parser = argparse.ArgumentParser()
+
     parser.add_argument('--repositoryfolder', required=False, default=".")
-    parser.add_argument('-v', '--verbosity', required=False, default=1)
+    verbosity_values = ", ".join(f"{lvl.value}={lvl.name}" for lvl in LogLevel)
+    parser.add_argument('-v', '--verbosity', required=False, default=3, help=f"Sets the loglevel. Possible values: {verbosity_values}")
     parser.add_argument('--targetenvironment', required=False, default="QualityCheck")
     parser.add_argument('--additionalargumentsfile', required=False, default=None)
     parser.add_argument('--removeuncommittedfiles', required=False, default=False, action='store_true')
+    parser.add_argument("-c",'--nocache', required=False, default=False, action='store_true')
+    parser.add_argument('--ispremerge', required=False, default=False, action='store_true')
+
     args = parser.parse_args()
-    TasksForCommonProjectStructure().build_codeunits(args.repositoryfolder, int(args.verbosity), args.targetenvironment, args.additionalargumentsfile, False, None, sys.argv, args.removeuncommittedfiles)
+    
+    verbosity=LogLevel(int(args.verbosity))
+
+    repo:str=args.repositoryfolder
+    if not os.path.isabs(args.repositoryfolder):
+        repo=GeneralUtilities.resolve_relative_path(args.repositoryfolder,os.getcwd())
+
+    t:TFCPS_CodeUnit_BuildCodeUnits=TFCPS_CodeUnit_BuildCodeUnits(repo,verbosity,args.targetenvironment,args.additionalargumentsfile,not args.nocache,args.ispremerge) 
+    t.build_codeunits()
     return 0
 
 
 def BuildCodeUnitsC() -> int:
     parser = argparse.ArgumentParser()
     parser.add_argument('--repositoryfolder', required=False, default=".")
-    parser.add_argument('-v', '--verbosity', required=False, default=1)
+    verbosity_values = ", ".join(f"{lvl.value}={lvl.name}" for lvl in LogLevel)
+    parser.add_argument('-v', '--verbosity', required=False, default=3, help=f"Sets the loglevel. Possible values: {verbosity_values}")
     parser.add_argument('--targetenvironment', required=False, default="QualityCheck")
     parser.add_argument('--additionalargumentsfile', required=False, default=None)
     parser.add_argument('--image', required=False, default="scbuilder:latest")
-    args = parser.parse_args()
+    #args = parser.parse_args()
     GeneralUtilities.reconfigure_standrd_input_and_outputs()
-    TasksForCommonProjectStructure().build_codeunitsC(args.repositoryfolder, args.image, int(args.verbosity), args.targetenvironment, args.additionalargumentsfile, sys.argv)
+    #t=TasksForCommonProjectStructure(args)
+    #t.build_codeunitsC(args.repositoryfolder, args.image, args.targetenvironment, args.additionalargumentsfile, sys.argv)
+    #return 0
+    return 1#TODO
+
+def UpdateDependencies() -> int:
+    parser = argparse.ArgumentParser()
+
+    parser.add_argument('--repositoryfolder', required=False, default=".")
+    verbosity_values = ", ".join(f"{lvl.value}={lvl.name}" for lvl in LogLevel)
+    parser.add_argument('-v', '--verbosity', required=False, default=3, help=f"Sets the loglevel. Possible values: {verbosity_values}")
+    parser.add_argument('--targetenvironment', required=False, default="QualityCheck")
+    parser.add_argument('--additionalargumentsfile', required=False, default=None)
+    parser.add_argument('--removeuncommittedfiles', required=False, default=False, action='store_true')
+    parser.add_argument("-c",'--nocache', required=False, default=False, action='store_true')
+
+    args = parser.parse_args()
+    
+    verbosity=LogLevel(int(args.verbosity))
+
+    repo:str=args.repositoryfolder
+    if not os.path.isabs(args.repositoryfolder):
+        repo=GeneralUtilities.resolve_relative_path(args.repositoryfolder,os.getcwd())
+
+    t:TFCPS_CodeUnit_BuildCodeUnits=TFCPS_CodeUnit_BuildCodeUnits(repo,verbosity,args.targetenvironment,args.additionalargumentsfile,not args.nocache,False) 
+    t.update_dependencies()
     return 0
 
 
@@ -389,7 +432,8 @@ def CreateChangelogEntry() -> int:
         folder = args.repositorypath
     else:
         folder = GeneralUtilities.resolve_relative_path(args.repositorypath, os.getcwd())
-    TasksForCommonProjectStructure().create_changelog_entry(folder, args.message, args.commit, args.force)
+    t=TFCPS_Tools_General(ScriptCollectionCore())
+    t.create_changelog_entry(folder, args.message, args.commit, args.force)
     return 0
 
 
@@ -607,13 +651,14 @@ def NpmI() -> int:
     parser.add_argument('-d', '--directory', required=False, default=".")
     parser.add_argument('-f', '--force', action='store_true', required=False, default=False)
     parser.add_argument('-v', '--verbose', action='store_true', required=False, default=False)
+    parser.add_argument('-c', '--nocache', action='store_true', required=False, default=False)
     args = parser.parse_args()
     if os.path.isabs(args.directory):
         folder = args.directory
-    else:
+    else: 
         folder = GeneralUtilities.resolve_relative_path(args.directory, os.getcwd())
-    t = TasksForCommonProjectStructure()
-    t.do_npm_install(folder, args.force, 3 if args.verbose else 0)
+    t = TFCPS_Tools_General(ScriptCollectionCore())
+    t.do_npm_install(folder, args.force,not args.nocache)
     return 0
 
 
@@ -747,10 +792,11 @@ def SetFileContent() -> int:
 def GenerateTaskfileFromWorkspacefile() -> int:
     parser = argparse.ArgumentParser(description="Generates a taskfile.yml-file from a .code-workspace-file")
     parser.add_argument('-f', '--repositoryfolder', required=True)
-    args = parser.parse_args()
-    t = TasksForCommonProjectStructure()
-    t.generate_tasksfile_from_workspace_file(args.repositoryfolder)
-    return 0
+    #args = parser.parse_args()
+    #t = TasksForCommonProjectStructure()
+    #t.generate_tasksfile_from_workspace_file(args.repositoryfolder)
+    #return 0
+    return 1#TODO
 
 
 def UpdateTimestampInFile() -> int:
@@ -782,5 +828,7 @@ def LOC() -> int:
         excluded_patterns = excluded_patterns + sc.default_excluded_patterns_for_loc
     if args.excluded_pattern is not None:
         excluded_patterns = excluded_patterns + args.excluded_pattern
-    GeneralUtilities.write_message_to_stdout(str(sc.get_lines_of_code(folder, excluded_patterns, args.verbose)))
+    if args.verbose:
+        sc.log.loglevel=LogLevel.Debug
+    GeneralUtilities.write_message_to_stdout(str(sc.get_lines_of_code(folder, excluded_patterns)))
     return 0

ScriptCollection/GeneralUtilities.py

@@ -1082,24 +1082,39 @@ class GeneralUtilities:
 
     @staticmethod
     @check_arguments
-    def assert_file_exists(file: str) -> str:
-        GeneralUtilities.assert_condition(os.path.isfile(file), f"File '{file}' does not exist.")
+    def assert_file_exists(file: str,message=None) -> None:
+        if message is None:
+            message=f"File '{file}' does not exist."
+        GeneralUtilities.assert_condition(os.path.isfile(file), message)
 
     @staticmethod
     @check_arguments
-    def assert_file_does_not_exist(file: str) -> str:
-        GeneralUtilities.assert_condition(not os.path.isfile(file), f"File '{file}' exists.")
+    def assert_file_does_not_exist(file: str,message=None) -> None:
+        if message is None:
+            message=f"File '{file}' exists."
+        GeneralUtilities.assert_condition(not os.path.isfile(file), message)
 
     @staticmethod
     @check_arguments
-    def assert_folder_exists(folder: str) -> str:
-        GeneralUtilities.assert_condition(os.path.isdir(folder), f"Folder '{folder}' does not exist.")
+    def assert_folder_exists(folder: str,message=None) -> None:
+        if message is None:
+            message=f"Folder '{folder}' does not exist."
+        GeneralUtilities.assert_condition(os.path.isdir(folder),message )
 
     @staticmethod
     @check_arguments
-    def assert_folder_does_not_exist(folder: str) -> str:
+    def assert_folder_does_not_exist(folder: str,message=None) -> None:
+        if message is None:
+            message= f"Folder '{folder}' exists."
         GeneralUtilities.assert_condition(not os.path.isdir(folder), f"Folder '{folder}' exists.")
 
+    @staticmethod
+    @check_arguments
+    def assert_not_null(obj,message:str=None) -> str:
+        if message is None:
+            message="Variable is not set"
+        GeneralUtilities.assert_condition(obj is not None, message)
+
     @staticmethod
     @check_arguments
     def retry_action(action, amount_of_attempts: int, action_name: str = None) -> None:

ScriptCollection/ProgramRunnerBase.py

@@ -9,11 +9,6 @@ class ProgramRunnerBase:
     @abstractmethod
     @GeneralUtilities.check_arguments
     def run_program_argsasarray_async_helper(self, program: str, arguments_as_array: list[str] = [], working_directory: str = None, custom_argument: object = None, interactive: bool = False) -> Popen:
-        # Verbosity:
-        # 0=Quiet (No output will be printed.)
-        # 1=Normal (If the exitcode of the executed program is not 0 then the StdErr will be printed.)
-        # 2=Full (Prints StdOut and StdErr of the executed program.)
-        # 3=Verbose (Same as "Full" but with some more information.)
         raise NotImplementedError
 
     # Return-values program_runner: Exitcode, StdOut, StdErr, Pid

ScriptCollection/ProgramRunnerEpew.py

@@ -7,6 +7,7 @@ from uuid import uuid4
 from .GeneralUtilities import GeneralUtilities
 from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
+from .SCLog import LogLevel
 
 
 class CustomEpewArgument:
@@ -17,7 +18,7 @@ class CustomEpewArgument:
     addLogOverhead: bool
     title: str
     log_namespace: str
-    verbosity: int
+    verbosity: LogLevel
     arguments_for_log:  list[str]
     tempdir = os.path.join(tempfile.gettempdir(), str(uuid4()))
     stdoutfile = tempdir + ".epew.stdout.txt"
@@ -25,7 +26,7 @@ class CustomEpewArgument:
     exitcodefile = tempdir + ".epew.exitcode.txt"
     pidfile = tempdir + ".epew.pid.txt"
 
-    def __init__(self, print_errors_as_information: bool, log_file: str, timeoutInSeconds: int, addLogOverhead: bool, title: str, log_namespace: str, verbosity: int,  arguments_for_log:  list[str]):
+    def __init__(self, print_errors_as_information: bool, log_file: str, timeoutInSeconds: int, addLogOverhead: bool, title: str, log_namespace: str, verbosity: LogLevel,  arguments_for_log:  list[str]):
         self.print_errors_as_information = print_errors_as_information
         self.log_file = log_file
         self.timeoutInSeconds = timeoutInSeconds
@@ -58,19 +59,40 @@ class ProgramRunnerEpew(ProgramRunnerBase):
             if custom_argument.pidfile is not None:
                 args.append(f'-r {custom_argument.pidfile}')
             args.append(f'-d {str(custom_argument.timeoutInSeconds*1000)}')
-            args.append(f'-t "{custom_argument.title}"')
-            args.append(f'-l "{custom_argument.log_namespace}"')
+            if GeneralUtilities.string_has_content(custom_argument.title):
+                args.append(f'-t "{custom_argument.title}"')
+            if GeneralUtilities.string_has_content(custom_argument.log_namespace):
+                args.append(f'-l "{custom_argument.log_namespace}"')
             if not GeneralUtilities.string_is_none_or_whitespace(custom_argument.log_file):
                 args.append(f'-f "{custom_argument.log_file}"')
             if custom_argument.print_errors_as_information:
                 args.append("-i")
             if custom_argument.addLogOverhead:
                 args.append("-g")
-            args.append("-v "+str(custom_argument.verbosity))
+            args.append("-v "+str(self.__get_microsoft_loglevel()))
             return ProgramRunnerPopen().run_program_argsasarray_async_helper("epew", args, working_directory, custom_argument, interactive)
         else:
             raise ValueError("Epew is not available.")
 
+    def __get_microsoft_loglevel(self):
+        #see https://learn.microsoft.com/en-us/dotnet/api/microsoft.extensions.logging.loglevel
+        #match self.verbosity:
+        #    case LogLevel.Quiet:
+        #        return 6
+        #    case LogLevel.Error:
+        #        return 4
+        #    case LogLevel.Warning:
+        #        return 3
+        #    case LogLevel.Information:
+        #        return 5
+        #    case LogLevel.Debug:
+        #        return 1
+        #    case LogLevel.Diagnostig:
+        #        return 0
+        #    case _:
+        #        raise ValueError(f"Unhandled log level: {level}")
+        return 2#TODO
+
     # Return-values program_runner: Exitcode, StdOut, StdErr, Pid
     @GeneralUtilities.check_arguments
     def wait(self, process: Popen, custom_argument: object = None) -> tuple[int, str, str, int]:

ScriptCollection/ProgramRunnerMock.py

@@ -0,0 +1,2 @@
+class ProgramRunnerPopen():
+    pass

ScriptCollection/SCLog.py

@@ -17,7 +17,7 @@ class LogLevel(Enum):
 
 
 class SCLog:
-    loglevel: LogLevel
+    loglevel: LogLevel#minimum loglevel
     log_file: str
     add_overhead_to_console: bool
     add_overhead_to_logfile: bool
@@ -36,8 +36,8 @@ class SCLog:
         self.print_as_color = print_as_color
 
     @GeneralUtilities.check_arguments
-    def log_exception(self, message: str, ex: Exception, current_traceback):
-        self.log(f"Exception: {message}; Exception-details: {str(ex)}; Traceback:  {current_traceback.format_exc()}", LogLevel.Error)
+    def log_exception(self, message: str, ex: Exception, current_traceback,loglevel:LogLevel=LogLevel.Error):
+        self.log(f"Exception: {message}; Exception-details: {str(ex)}; Traceback:  {current_traceback.format_exc()}", loglevel)
 
     @GeneralUtilities.check_arguments
     def log(self, message: str, loglevel: LogLevel = None):
@@ -53,7 +53,7 @@ class SCLog:
         if loglevel is None:
             loglevel = LogLevel.Information
 
-        if int(loglevel) > int(self.loglevel):
+        if int(self.loglevel)<int(loglevel) :
             return
 
         if message.endswith("\n"):
@@ -99,7 +99,7 @@ class SCLog:
                     GeneralUtilities.print_text_in_yellow(part2, print_to_std_out, self.print_as_color)
                 elif loglevel == LogLevel.Debug:
                     GeneralUtilities.print_text_in_cyan(part2, print_to_std_out, self.print_as_color)
-                elif loglevel == LogLevel.Debug:
+                elif loglevel == LogLevel.Diagnostic:
                     GeneralUtilities.print_text_in_cyan(part2, print_to_std_out, self.print_as_color)
                 else:
                     raise ValueError("Unknown loglevel.")