effectual 0.3.4__py3-none-any.whl → 0.4.0__py3-none-any.whl

effectual/build.py

@@ -1,8 +1,10 @@
+import importlib
 import os
 import shutil
 import zipfile
 from pathlib import Path
 from time import perf_counter
+from typing import Any
 
 import rtoml
 
@@ -19,14 +21,14 @@ def bundleFiles(
     compressionLevel: int,
     minification: bool,
 ) -> None:
-    """Bundles dependencies and scripts into a single .py archive
+    """Bundles dependencies and scripts into a single .pyz archive
 
     Args:
         sourceDirectory (Path): Source directory which must contain a __main__.py script
         outputDirectory (Path): Output directory for the bundle
         outputFileName (str): Name of the output bundle
         compressionLevel (int): Compression level for the bundle from 0-9
-        minification (bool): If the dependencies and scripts should be minified
+        minification (bool): If the scripts should be minified
     """
     outputDirectory.mkdir(parents=True, exist_ok=True)
     outputPath: Path = outputDirectory / outputFileName
@@ -65,7 +67,7 @@ def bundleFiles(
 
 def dependencies(minify: bool) -> None:
     with open("./pyproject.toml", "r", encoding="utf-8") as file:
-        packages: list[str] = dict(rtoml.load(file)).get("project").get("dependencies")
+        packages: list[str] = dict(rtoml.load(file)).get("project").get("dependencies")  # type: ignore
 
     arguments: list[str] = ["--no-compile", "--quiet", "--no-binary=none", "--no-cache"]
 
@@ -81,18 +83,19 @@ def dependencies(minify: bool) -> None:
 
     print(f"{tagColor('optimizing')} || {', '.join(packages)}")
 
-    import multiprocessing
+    multiprocessing = importlib.import_module("multiprocessing")
 
     with multiprocessing.Pool(processes=multiprocessing.cpu_count()) as pool:
         pool.map(optimizeDependencies, Path(pathToInstallTo).rglob("*"))
 
 
 def optimizeDependencies(file: Path) -> None:
+    stringFile: str = str(file)
     if (
         file.suffix in (".pyc", ".pyd", ".exe", ".typed")
-        or "__pycache__" in str(file)
-        or ".dist-info" in str(file)
-        or ".lock" in str(file)
+        or "__pycache__" in stringFile
+        or ".dist-info" in stringFile
+        or ".lock" in stringFile
     ):
         try:
             file.unlink()
@@ -109,7 +112,7 @@ def main() -> None:
         RuntimeError: In the event there is no source directory
     """
 
-    configData: dict = loadConfig("./pyproject.toml")
+    configData: dict[Any, Any] = loadConfig("./pyproject.toml")
 
     sourceDirectory: Path = Path(configData.get("sourceDirectory", "src/"))
     outputDirectory: Path = Path(configData.get("outputDirectory", "out/"))
@@ -126,18 +129,18 @@ def main() -> None:
         )
 
     uvHashPath: Path = Path("./.effectual_cache/pyprojectHash.toml")
-    currentHash: dict[str] = dict()
+    currentHash: dict[str, dict[str, str]] = dict()
 
     startTime = perf_counter()
 
     Path("./.effectual_cache/").mkdir(parents=True, exist_ok=True)
-    currentHash["hashes"]: dict[dict] = dict()
-    currentHash["hashes"]["pyproject"] = getFilehash("./pyproject.toml")
-    currentHash["hashes"]["lock"] = getFilehash("./uv.lock")
+    currentHash["hashes"] = dict()
+    currentHash["hashes"]["pyproject"] = getFilehash(Path("./pyproject.toml"))
+    currentHash["hashes"]["lock"] = getFilehash(Path("./uv.lock"))
 
     if uvHashPath.exists():
         with open(uvHashPath, "r") as file:
-            lastHash: dict = dict(rtoml.load(file)).get("hashes")
+            lastHash: dict[Any, Any] = dict(rtoml.load(file)).get("hashes")
         if currentHash["hashes"] != lastHash:
             with open(uvHashPath, "w") as file:
                 rtoml.dump(currentHash, file)

effectual/config.py

@@ -1,7 +1,9 @@
+from typing import Any
+
 import rtoml
 
 
-def loadConfig(configPath: str) -> dict:
+def loadConfig(configPath: str) -> dict[Any, Any]:
     """Loads effectual config from a file
 
     Args:
@@ -16,8 +18,17 @@ def loadConfig(configPath: str) -> dict:
     """
     try:
         with open(configPath, "r", encoding="utf-8") as file:
-            tomlFile: dict = dict(rtoml.load(file))
-            configData: dict = tomlFile.get("tool").get("effectual")
+            configData: dict[Any, Any] = dict(rtoml.load(file))
+            if configData is None:
+                configData = {
+                    "sourceDirectory": "./src/",
+                    "outputDirectory": "./dist/",
+                    "outputFileName": "bundle.pyz",
+                    "minification": True,
+                    "compressionLevel": 5,
+                }
+            else:
+                configData = configData.get("tool").get("effectual")  # type: ignore
 
     except ValueError as e:
         raise RuntimeError(f"Invalid TOML in {configPath}: {e}")

effectual/developer.py

@@ -2,6 +2,7 @@ import subprocess
 import time
 import zipfile
 from pathlib import Path
+from typing import Any
 
 from .colors import completeColor, fileColor, tagColor
 from .config import loadConfig
@@ -27,10 +28,9 @@ def bundle(sourceDirectory: Path, outputFile: Path) -> None:
 
 def main() -> None:
     """Super fast bundling for the 'task dev' command"""
-
-    configData: dict = loadConfig("./pyproject.toml")
+    configData: dict[Any, Any] = loadConfig("./pyproject.toml")
     sourceDirectory: Path = Path(configData.get("sourceDirectory", "src/"))
-    outputFileName: str = Path(configData.get("outputFileName", "bundle.pyz"))
+    outputFileName: Path = Path(configData.get("outputFileName", "bundle.pyz"))
     devBundlePath: Path = Path("./.effectual_cache/dev/")
     devBundlePath.mkdir(parents=True, exist_ok=True)
 
@@ -40,12 +40,12 @@ def main() -> None:
 
     runCommand = subprocess.Popen(["uv", "run", outputFile], shell=True)
 
-    lastHashList: list[str] = getAllHashes(sourceDirectory)
+    lastHashSet: set[str] = getAllHashes(sourceDirectory, ".py")
 
     while True:
-        currentHashList: list[str] = getAllHashes(sourceDirectory)
-        if currentHashList != lastHashList:
-            lastHashList = currentHashList
+        currentHashSet: set[str] = getAllHashes(sourceDirectory, ".py")
+        if currentHashSet != lastHashSet:
+            lastHashSet = currentHashSet
             runCommand.kill()
             runCommand.wait()
             outputFile.unlink()

effectual/fileHash.py

@@ -7,26 +7,28 @@ def getFilehash(filePath: Path) -> str:
     """Gets the file hash of a single python script
 
     Args:
-        filePath (Path): Path to the python script
+        filePath (Path): Path to a file
 
     Returns:
-        str: Hash of the python script
+        str: Hash of the file
     """
     with open(filePath, "rb") as file:
-        fileHash = hashlib.sha256(file.read()).hexdigest()
+        fileHash = hashlib.sha1(file.read()).hexdigest()
     return fileHash
 
 
-def getAllHashes(sourceDirectory: Path) -> list[str]:
+def getAllHashes(sourceDirectory: Path, fileExtension: str) -> set[str]:
     """Gets all hashes in directory
 
     Args:
-        sourceDirectory (Path): Path to the python scripts
+        sourceDirectory (Path): Path to a folder containing files
 
     Returns:
-        dict[str]: Dictionary containing paths and hashes
+        set[str]: Set containing paths and hashes
     """
 
     with Pool() as pool:
-        hashList: list[str] = pool.map(getFilehash, sourceDirectory.glob("*.py"))
+        hashList: set[str] = set(
+            pool.map(getFilehash, sourceDirectory.glob(f"*.{fileExtension}"))
+        )
     return hashList

effectual/minifier.py

@@ -38,7 +38,7 @@ def minifyToString(filePath: Path) -> str:
     Returns:
         str: Minified string
     """
-    with filePath.open("r", encoding="utf-8") as fileR:
+    with filePath.open("r") as fileR:
         minifiedCode: str = str(
             minify(
                 fileR.read(),
@@ -46,6 +46,6 @@ def minifyToString(filePath: Path) -> str:
                 remove_literal_statements=True,
                 remove_debug=True,
             )
-        ).encode("utf-8")
+        )
 
     return minifiedCode

{effectual-0.3.4.dist-info → effectual-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: effectual
-Version: 0.3.4
+Version: 0.4.0
 Summary: A python package/script bundler
 Project-URL: Homepage, https://github.com/effectualpy/effectual
 Author-email: jake <jakewdr@proton.me>

effectual-0.4.0.dist-info/RECORD

@@ -0,0 +1,12 @@
+effectual/__init__.py,sha256=9hA5S-390BtY7m-NojGHioaBJJ8vEM3IXuMvmzWBv0E,407
+effectual/build.py,sha256=LjPsTegLoxf2Ta3VwOV2LcMITf7ZEdPOuIcAJ0RXq7M,5669
+effectual/colors.py,sha256=na7SEUSXM7aHvEKeIAn5shrZJtrBYq_ZUp121GRO_PQ,1411
+effectual/config.py,sha256=otTF0HIBwECrHpXsB-e_rlxDZg5uRwIIoUPC37TZl8Q,1165
+effectual/developer.py,sha256=-S55Vllozoi-WlJKjD2SXiuLuOuGEHnsmz1I3S5vIUo,2053
+effectual/fileHash.py,sha256=ftFDY0RY1RF-IQxgbS9HfJp9mzgc3I6Acl69CIKUL2o,848
+effectual/minifier.py,sha256=7GHgQWzin2J1W62yMReHXaYIChXc3f0rNJA-yY4LDEI,1313
+effectual-0.4.0.dist-info/METADATA,sha256=heiu95UEveT9SrhVpai8S_fLEToTc56u55kjSqWQTxo,2527
+effectual-0.4.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+effectual-0.4.0.dist-info/entry_points.txt,sha256=1W7EjlLZkw_Wz8V1SgdzzDis-CRE5IINyg74upsB0zU,40
+effectual-0.4.0.dist-info/licenses/LICENSE,sha256=RrVXS_K_FctToNx9BLuZm9vbcpTi3PHNzWMaz7QyVeg,1082
+effectual-0.4.0.dist-info/RECORD,,

effectual-0.3.4.dist-info/RECORD

@@ -1,12 +0,0 @@
-effectual/__init__.py,sha256=9hA5S-390BtY7m-NojGHioaBJJ8vEM3IXuMvmzWBv0E,407
-effectual/build.py,sha256=AfeQXckE2dhEpJAZg7T0dxYKudg7n7Ghy1BVc4f6L9A,5517
-effectual/colors.py,sha256=na7SEUSXM7aHvEKeIAn5shrZJtrBYq_ZUp121GRO_PQ,1411
-effectual/config.py,sha256=LzGT8e-zq7Rc-HOp3-r6g1XRiN9v0sCq5aeWL0bqFLY,754
-effectual/developer.py,sha256=Ia6LPvDbO5kkF9dRIw3H23sulmWT8pLis55-PRQIInI,2014
-effectual/fileHash.py,sha256=m2oPjhAcSH0Qc7J7aMkmjOlgDr5Lzilcfl1ppeoDxI8,810
-effectual/minifier.py,sha256=RlUD0mUNDi7YZ1P-dDL6Y4FlCkfiiJP8G4TpX2y45iI,1347
-effectual-0.3.4.dist-info/METADATA,sha256=E0sHvdgK8jKXY-B6pP5Cn8dWVDERD7h-kU3GfZ7eK8M,2527
-effectual-0.3.4.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-effectual-0.3.4.dist-info/entry_points.txt,sha256=1W7EjlLZkw_Wz8V1SgdzzDis-CRE5IINyg74upsB0zU,40
-effectual-0.3.4.dist-info/licenses/LICENSE,sha256=RrVXS_K_FctToNx9BLuZm9vbcpTi3PHNzWMaz7QyVeg,1082
-effectual-0.3.4.dist-info/RECORD,,