diff --git a/.github/workflows/upload-assets.yml b/.github/workflows/build-addon.yml similarity index 50% rename from .github/workflows/upload-assets.yml rename to .github/workflows/build-addon.yml index 97884f6..b3e5073 100644 --- a/.github/workflows/upload-assets.yml +++ b/.github/workflows/build-addon.yml @@ -50,33 +50,13 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - upload_blender_addon: - name: Upload Blender Add-on - needs: draft_release - runs-on: ubuntu-latest - steps: - - name: Checkout Code - uses: actions/checkout@v4 - with: - lfs: "true" - - name: Zip Add-on - run: | - zip -r package.zip bioxelnodes - - name: Upload Release Asset - id: upload-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.draft_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: ./package.zip - asset_name: BioxelNodes_Addon_${{ needs.draft_release.outputs.version }}.zip - asset_content_type: application/zip - - upload_blender_extension: - name: Upload Blender Extension + build_blender_add-on: + name: Build Blender Extension needs: draft_release runs-on: ubuntu-latest + strategy: + matrix: + platform: ["windows-x64", "linux-x64", "macos-arm64", "macos-x64"] steps: - name: Checkout Code uses: actions/checkout@v4 @@ -86,21 +66,10 @@ jobs: uses: actions/setup-python@v4 with: python-version: 3.11 - - name: Zip Extension + - name: Build Add-on run: | - pip download SimpleITK==2.3.1 --dest wheels --only-binary=:all: --python-version=3.11 --platform=win_amd64 - pip download pyometiff==1.0.0 --dest wheels --only-binary=:all: --python-version=3.11 --platform=win_amd64 - pip download mrcfile==1.5.1 --dest wheels --only-binary=:all: --python-version=3.11 --platform=win_amd64 - mkdir bioxelnodes/wheels - cp wheels/SimpleITK-2.3.1-cp311-cp311-win_amd64.whl bioxelnodes/wheels/SimpleITK-2.3.1-cp311-cp311-win_amd64.whl - cp wheels/lxml-5.2.2-cp311-cp311-win_amd64.whl bioxelnodes/wheels/lxml-5.2.2-cp311-cp311-win_amd64.whl - cp wheels/tifffile-2024.7.21-py3-none-any.whl bioxelnodes/wheels/tifffile-2024.7.21-py3-none-any.whl - cp wheels/pyometiff-1.0.0-py3-none-any.whl bioxelnodes/wheels/pyometiff-1.0.0-py3-none-any.whl - cp wheels/mrcfile-1.5.1-py2.py3-none-any.whl bioxelnodes/wheels/mrcfile-1.5.1-py2.py3-none-any.whl - rm -r bioxelnodes/externalpackage - cp extension/__init__.py bioxelnodes/__init__.py - cp extension/preferences.py bioxelnodes/preferences.py - cp extension/blender_manifest.toml bioxelnodes/blender_manifest.toml + pip install tomlkit + python build.py ${{ matrix.platform }} zip -r package.zip bioxelnodes - name: Upload Release Asset id: upload-release-asset @@ -110,5 +79,5 @@ jobs: with: upload_url: ${{ needs.draft_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps asset_path: ./package.zip - asset_name: BioxelNodes_Extension_${{ needs.draft_release.outputs.version }}.zip + asset_name: BioxelNodes_${{ needs.draft_release.outputs.version }}_${{ matrix.platform }}.zip asset_content_type: application/zip diff --git a/.gitignore b/.gitignore index cb08559..cde6464 100644 --- a/.gitignore +++ b/.gitignore @@ -133,4 +133,4 @@ blendcache_* .secrets -!bioxelnodes/scipy/_nd_image.cp311-win_amd64.pyd \ No newline at end of file +!scipy_ndimage/*/** \ No newline at end of file diff --git a/README.md b/README.md index 6bb8d79..7a49539 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Bioxel Nodes is a Blender addon for scientific volumetric data visualization. It ![cover](https://omoolab.github.io/BioxelNodes/latest/assets/cover.png) -- Fantastic rendering result, also support EEVEE NEXT. +- Realistic rendering result, also support EEVEE NEXT. - Support multiple formats. - Support 4D volumetric data. - All kinds of cutters. @@ -61,13 +61,13 @@ Welcome to our [discord server](https://discord.gg/pYkNyq2TjE), if you have any ## Compatible to Newer Version -**Updating this addon may break old files, so read the following carefully before updating** +**v0.3.x is not compatible to v0.2.x, Updating this addon may break old files. Read the following carefully before upgradation** -Before updating this addon, you need to ask yourself whether this project file will be modified again or not, if it's an archived project file, I would recommend that you run **Bioxel Nodes > Save Staged Data** to make the addon nodes permanent. In this way, there will be no potential problem with the nodes not functioning due to the addon update. +Before upgradation, you need to ask yourself whether this project file will be modified again or not, if it's an archived project file, I would recommend that you run **Bioxel Nodes > Save Staged Data** to make the addon nodes permanent. In this way, there will be no potential problem with the nodes not functioning due to the addon update. After the addon update, your old project files may not work either, this may be because you had executed **Save Staged Data**. If so, you need to execute **Bioxel Nodes > Relink Nodes to Addon** to relink them to make sure that the addon's new functionality and the addon nodes are synchronized. -Also, unlike the newer versions, the older shaders are not based on OSL, so if you find that you can't render volumes, you need to turn on **Open Shading Language (OSL)** in the Render Settings. +Also, the older shaders are not based on OSL, so if you find that you can't render volumes, you need to turn on **Open Shading Language (OSL)** in the Render Settings. ## Roadmap diff --git a/bioxelnodes/__init__.py b/bioxelnodes/__init__.py index 33b7e2d..6e3ec9f 100644 --- a/bioxelnodes/__init__.py +++ b/bioxelnodes/__init__.py @@ -4,17 +4,6 @@ from . import menus -bl_info = { - "name": "Bioxel Nodes", - "author": "Ma Nan", - "description": "", - "blender": (4, 1, 0), - "version": (0, 2, 9), - "location": "File -> Import", - "warning": "", - "category": "Node" -} - auto_load.init() diff --git a/bioxelnodes/assets/Nodes/BioxelNodes_4.1.blend b/bioxelnodes/assets/Nodes/BioxelNodes_4.1.blend deleted file mode 100644 index 016c4cf..0000000 --- a/bioxelnodes/assets/Nodes/BioxelNodes_4.1.blend +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b219a6f005718d8223766215a598ebde9b646c3960fb298d72ffc864791f3c3a -size 6691383 diff --git a/bioxelnodes/assets/Nodes/BioxelNodes_4.2.blend b/bioxelnodes/assets/Nodes/BioxelNodes_4.2.blend new file mode 100644 index 0000000..cd8978b --- /dev/null +++ b/bioxelnodes/assets/Nodes/BioxelNodes_4.2.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72cb911f858760dfcd37b4133fda272051cf9424644d0bbe196adff38d98f2f3 +size 6792906 diff --git a/bioxelnodes/bioxel/__init__.py b/bioxelnodes/bioxel/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/bioxelnodes/bioxel/container.py b/bioxelnodes/bioxel/container.py new file mode 100644 index 0000000..ca51ecc --- /dev/null +++ b/bioxelnodes/bioxel/container.py @@ -0,0 +1,9 @@ +from .layer import Layer + + +class Container(): + def __init__(self, + name, + layers: list[Layer] = []) -> None: + self.name = name + self.layers = layers diff --git a/bioxelnodes/bioxel/io.py b/bioxelnodes/bioxel/io.py new file mode 100644 index 0000000..8df8316 --- /dev/null +++ b/bioxelnodes/bioxel/io.py @@ -0,0 +1,43 @@ +from pathlib import Path +import uuid + + +# 3rd-party +import h5py + +from .container import Container +from .layer import Layer + + +def load_container(load_file: str): + load_path = Path(load_file).resolve() + with h5py.File(load_path, 'r') as file: + layers = [] + for key, layer_dset in file['layers'].items(): + layers.append(Layer(data=layer_dset[:], + name=layer_dset.attrs['name'], + kind=layer_dset.attrs['kind'], + affine=layer_dset.attrs['affine'])) + + container = Container(name=file.attrs['name'], + layers=layers) + + return container + + +def save_container(container: Container, save_file: str, overwrite=False): + save_path = Path(save_file).resolve() + if overwrite: + if save_path.is_file(): + save_path.unlink() + + with h5py.File(save_path, "w") as file: + file.attrs['name'] = container.name + layer_group = file.create_group("layers") + for layer in container.layers: + layer_key = uuid.uuid4().hex[:8] + layer_dset = layer_group.create_dataset(name=layer_key, + data=layer.data) + layer_dset.attrs['name'] = layer.name + layer_dset.attrs['kind'] = layer.kind + layer_dset.attrs['affine'] = layer.affine diff --git a/bioxelnodes/bioxel/layer.py b/bioxelnodes/bioxel/layer.py new file mode 100644 index 0000000..f44d1f9 --- /dev/null +++ b/bioxelnodes/bioxel/layer.py @@ -0,0 +1,131 @@ +import copy +import numpy as np + +from . import scipy +from . import skimage as ski + +# 3rd-party +import transforms3d + +# TODO: turn to dataclasses + + +class Layer(): + def __init__(self, + data: np.ndarray, + name: str, + kind="scalar", + affine=np.identity(4)) -> None: + if data.ndim != 5: + raise Exception("Data shape order should be TXYZC") + + affine = np.array(affine) + if affine.shape != (4, 4): + raise Exception("affine shape should be (4,4)") + + self.data = data + self.name = name + self.kind = kind + self.affine = affine + + @property + def bioxel_size(self): + t, r, z, s = transforms3d.affines.decompose44(self.affine) + return z.tolist() + + @property + def shape(self): + return self.data.shape[1:4] + + @property + def dtype(self): + return self.data.dtype + + @property + def origin(self): + t, r, z, s = transforms3d.affines.decompose44(self.affine) + return t.tolist() + + @property + def euler(self): + t, r, z, s = transforms3d.affines.decompose44(self.affine) + return list(transforms3d.euler.mat2euler(r)) + + @property + def min(self): + return float(np.min(self.data)) + + @property + def frame_count(self): + return self.data.shape[0] + + @property + def channel_count(self): + return self.data.shape[-1] + + @property + def max(self): + return float(np.max(self.data)) + + def copy(self): + return copy.deepcopy(self) + + def fill(self, value: float, mask: np.ndarray): + mask_frames = () + if mask.ndim == 4: + if mask.shape[0] != self.frame_count: + raise Exception("Mask frame count is not same as ") + for f in range(self.frame_count): + mask_frame = mask[f, :, :, :] + mask_frame = scipy.median_filter( + mask_frame.astype(np.float32), size=2) + mask_frames += (mask_frame,) + elif mask.ndim == 3: + for f in range(self.frame_count): + mask_frame = mask[:, :, :] + mask_frame = scipy.median_filter( + mask_frame.astype(np.float32), size=2) + mask_frames += (mask_frame,) + else: + raise Exception("Mask shape order should be TXYZ or XYZ") + + _mask = np.stack(mask_frames) + _mask = np.expand_dims(_mask, axis=-1) + self.data = _mask * value + (1-_mask) * self.data + + def resize(self, shape:tuple, progress_callback=None): + if len(shape) != 3: + raise Exception("Shape must be 3 dim") + + data = self.data + + # TXYZC > TXYZ + if self.kind in ['label', 'scalar']: + data = np.amax(data, -1) + + if self.kind in ['scalar']: + dtype = data.dtype + data = data.astype(np.float32) + + data_frames = () + for f in range(self.frame_count): + if progress_callback: + progress_callback(f, self.frame_count) + + frame = ski.resize(data[f, :, :, :], + shape, + preserve_range=True, + anti_aliasing=data.dtype.kind != "b") + + data_frames += (frame,) + + data = np.stack(data_frames) + + if self.kind in ['scalar']: + data = data.astype(dtype) + + # TXYZ > TXYZC + if self.kind in ['label', 'scalar']: + data = np.expand_dims(data, axis=-1) # expend channel + + self.data = data diff --git a/bioxelnodes/bioxel/parse.py b/bioxelnodes/bioxel/parse.py new file mode 100644 index 0000000..decec83 --- /dev/null +++ b/bioxelnodes/bioxel/parse.py @@ -0,0 +1,388 @@ +from pathlib import Path +import numpy as np +from .layer import Layer + +# 3rd-party +import SimpleITK as sitk +from pyometiff import OMETIFFReader +import mrcfile +import transforms3d + + +""" +Convert any volumetric data to 3D numpy array with order TXYZC +""" + +SUPPORT_EXTS = ['', '.dcm', '.DCM', '.DICOM', '.ima', '.IMA', + '.bmp', '.BMP', + '.PIC', '.pic', + '.gipl', '.gipl.gz', + '.jpg', '.JPG', '.jpeg', '.JPEG', + '.lsm', '.LSM', + '.tif', '.TIF', '.tiff', '.TIFF', + '.mnc', '.MNC', + '.mrc', '.rec', + '.mha', '.mhd', + '.hdf', '.h4', '.hdf4', '.he2', '.h5', '.hdf5', '.he5', + '.nia', '.nii', '.nii.gz', '.hdr', '.img', '.img.gz', + '.nrrd', '.nhdr', + '.png', '.PNG', + '.vtk', + '.ome.tiff', '.ome.tif', + '.mrc', '.mrc.gz', '.map', '.map.gz'] + +OME_EXTS = ['.ome.tiff', '.ome.tif', + '.tif', '.TIF', '.tiff', '.TIFF'] + +MRC_EXTS = ['.mrc', '.mrc.gz', '.map', '.map.gz'] + +DICOM_EXTS = ['', '.dcm', '.DCM', '.DICOM', '.ima', '.IMA'] + +SEQUENCE_EXTS = ['.bmp', '.BMP', + '.jpg', '.JPG', '.jpeg', '.JPEG', + '.tif', '.TIF', '.tiff', '.TIFF', + '.png', '.PNG'] + + +def get_ext(filepath: Path) -> str: + if filepath.name.endswith(".nii.gz"): + return ".nii.gz" + elif filepath.name.endswith(".img.gz"): + return ".img.gz" + elif filepath.name.endswith(".gipl.gz"): + return ".gipl.gz" + elif filepath.name.endswith(".ome.tiff"): + return ".ome.tiff" + elif filepath.name.endswith(".ome.tif"): + return ".ome.tif" + elif filepath.name.endswith(".mrc.gz"): + return ".mrc.gz" + elif filepath.name.endswith(".map.gz"): + return ".map.gz" + else: + return filepath.suffix + + +def get_file_name(filepath: Path): + ext = get_ext(filepath) + return filepath.name.removesuffix(ext).replace(" ", "-") + + +def get_file_index(filepath: Path): + name = get_file_name(filepath) + digits = "" + + # Iterate through the characters in reverse order + started = False + for char in name[::-1]: + if char.isdigit(): + started = True + # If the character is a digit, add it to the digits string + digits += char + else: + if started: + # If a non-digit character is encountered, stop the loop + break + + # Reverse the digits string to get the correct order + last_number = digits[::-1] + + return int(last_number) if last_number != "" else 0 + + +def get_sequence_name(filepath: Path) -> str: + name = get_file_name(filepath) + index = get_file_index(filepath) + return name.removesuffix(str(index)) + + +def collect_sequence(filepath: Path): + file_dict = {} + for f in filepath.parent.iterdir(): + if f.is_file() \ + and get_ext(filepath) == get_ext(f) \ + and get_sequence_name(filepath) == get_sequence_name(f): + index = get_file_index(f) + file_dict[index] = f + + for key in file_dict.copy().keys(): + if not file_dict.get(key+1) \ + and not file_dict.get(key-1): + del file_dict[key] + + file_dict = dict(sorted(file_dict.items())) + sequence = [str(f) for f in file_dict.values()] + + if len(sequence) == 0: + sequence = [str(filepath)] + + return sequence + + +def parse_volumetric_data(data_file: str, series_id="", progress_callback=None) -> Layer: + """Parse any volumetric data to numpy with shap (T,X,Y,Z,C) + + Args: + data_file (str): file path + series_id (str, optional): DICOM series id. Defaults to "". + + Returns: + _type_: _description_ + """ + + data_path = Path(data_file).resolve() + ext = get_ext(data_path) + + if progress_callback: + progress_callback(0, "Reading the Data...") + + is_sequence = False + if ext in SEQUENCE_EXTS: + sequence = collect_sequence(data_path) + if len(sequence) > 1: + is_sequence = True + + data = None + name = "", + description = "" + affine = np.identity(4) + spacing = (1, 1, 1) + origin = (0, 0, 0) + direction = (1, 0, 0, 0, 1, 0, 0, 0, 1) + + # Parsing with mrcfile + if data is None and ext in MRC_EXTS and not is_sequence: + print("Parsing with mrcfile...") + # TODO: much to do with mrc + with mrcfile.open(data_path, 'r') as mrc: + data = mrc.data + # mrc.print_header() + # print(data.shape) + # print(mrc.voxel_size) + + if mrc.is_single_image(): + data = np.expand_dims(data, axis=0) # expend frame + data = np.expand_dims(data, axis=-1) # expend Z + data = np.expand_dims(data, axis=-1) # expend channel + + elif mrc.is_image_stack(): + data = np.expand_dims(data, axis=-1) # expend Z + data = np.expand_dims(data, axis=-1) # expend channel + + elif mrc.is_volume(): + data = np.expand_dims(data, axis=0) # expend frame + data = np.expand_dims(data, axis=-1) # expend channel + + elif mrc.is_volume_stack(): + data = np.expand_dims(data, axis=-1) # expend channel + + name = get_file_name(data_path) + spacing = (mrc.voxel_size.x, + mrc.voxel_size.y, + mrc.voxel_size.z) + + # Parsing with OMETIFFReader + if data is None and ext in OME_EXTS and not is_sequence: + print("Parsing with OMETIFFReader...") + reader = OMETIFFReader(fpath=data_path) + ome_image, metadata, xml_metadata = reader.read() + + # TODO: some old bio-format tiff the header is not the same. + if progress_callback: + progress_callback(0.5, "Transpose to 'TXYZC'...") + + try: + # print(ome_image.shape) + # for key in metadata: + # print(f"{key},{metadata[key]}") + ome_order = metadata['DimOrder BF Array'] + if ome_image.ndim == 2: + ome_order = ome_order.replace("T", "")\ + .replace("C", "").replace("Z", "") + bioxel_order = (ome_order.index('X'), + ome_order.index('Y')) + data = np.transpose(ome_image, bioxel_order) + data = np.expand_dims(data, axis=0) # expend frame + data = np.expand_dims(data, axis=-1) # expend Z + data = np.expand_dims(data, axis=-1) # expend channel + + elif ome_image.ndim == 3: + # -> XYZC + ome_order = ome_order.replace("T", "").replace("C", "") + bioxel_order = (ome_order.index('X'), + ome_order.index('Y'), + ome_order.index('Z')) + data = np.transpose(ome_image, bioxel_order) + data = np.expand_dims(data, axis=0) # expend frame + data = np.expand_dims(data, axis=-1) # expend channel + elif ome_image.ndim == 4: + # -> XYZC + ome_order = ome_order.replace("T", "") + bioxel_order = (ome_order.index('X'), + ome_order.index('Y'), + ome_order.index('Z'), + ome_order.index('C')) + data = np.transpose(ome_image, bioxel_order) + data = np.expand_dims(data, axis=0) # expend frame + elif ome_image.ndim == 5: + # -> TXYZC + bioxel_order = (ome_order.index('T'), + ome_order.index('X'), + ome_order.index('Y'), + ome_order.index('Z'), + ome_order.index('C')) + data = np.transpose(ome_image, bioxel_order) + + try: + spacing = (metadata['PhysicalSizeX'], + metadata['PhysicalSizeY'], + metadata['PhysicalSizeZ']) + except: + ... + + name = get_file_name(data_path) + except: + ... + + # Parsing with SimpleITK + if data is None: + print("Parsing with SimpleITK...") + if ext in DICOM_EXTS: + data_dirpath = data_path.parent + reader = sitk.ImageSeriesReader() + reader.MetaDataDictionaryArrayUpdateOn() + reader.LoadPrivateTagsOn() + series_files = reader.GetGDCMSeriesFileNames( + str(data_dirpath), series_id) + reader.SetFileNames(series_files) + + itk_image = reader.Execute() + # for k in reader.GetMetaDataKeys(0): + # v = reader.GetMetaData(0, k) + # print(f'({k}) = = "{v}"') + + def get_meta(key): + try: + stirng = reader.GetMetaData(0, key).removesuffix(" ") + if stirng in ["No study description", + "No series description", + ""]: + return None + else: + return stirng + except: + return None + + study_description = get_meta("0008|1030") + series_description = get_meta("0008|103e") + series_modality = get_meta("0008|0060") + + name = study_description or data_dirpath.name + if series_description and series_modality: + description = f"{series_description}-{series_modality}" + elif series_description: + description = series_description + elif series_modality: + description = series_modality + else: + description = "" + + name = name.replace(" ", "-") + description = description.replace(" ", "-") + + elif ext in SEQUENCE_EXTS and is_sequence: + itk_image = sitk.ReadImage(sequence) + name = get_sequence_name(data_path) + else: + itk_image = sitk.ReadImage(data_path) + name = get_file_name(data_path) + + # for key in itk_image.GetMetaDataKeys(): + # print(f"{key},{itk_image.GetMetaData(key)}") + + if progress_callback: + progress_callback(0.5, "Transpose to 'TXYZC'...") + + if itk_image.GetDimension() == 2: + + data = sitk.GetArrayFromImage(itk_image) + + if data.ndim == 3: + data = np.transpose(data, (1, 0, 2)) + + data = np.expand_dims(data, axis=-2) # expend Z + else: + data = np.transpose(data) + data = np.expand_dims(data, axis=-1) # expend Z + data = np.expand_dims(data, axis=-1) # expend channel + + data = np.expand_dims(data, axis=0) # expend frame + + elif itk_image.GetDimension() == 3: + if ext not in SEQUENCE_EXTS: + itk_image = sitk.DICOMOrient(itk_image, 'RAS') + # After sitk.DICOMOrient(), origin and direction will also orient base on LPS + # so we need to convert them into RAS + # affine = axis_conversion(from_forward='-Z', + # from_up='-Y', + # to_forward='-Z', + # to_up='Y').to_4x4() + + affine = np.array([[-1.0000, 0.0000, 0.0000, 0.0000], + [0.0000, -1.0000, 0.0000, 0.0000], + [0.0000, 0.0000, 1.0000, 0.0000], + [0.0000, 0.0000, 0.0000, 1.0000]]) + + spacing = tuple(itk_image.GetSpacing()) + origin = tuple(itk_image.GetOrigin()) + direction = tuple(itk_image.GetDirection()) + + data = sitk.GetArrayFromImage(itk_image) + # transpose ijk to kji + if data.ndim == 4: + data = np.transpose(data, (2, 1, 0, 3)) + else: + data = np.transpose(data) + data = np.expand_dims(data, axis=-1) # expend channel + + data = np.expand_dims(data, axis=0) # expend frame + + elif itk_image.GetDimension() == 4: + + spacing = tuple(itk_image.GetSpacing()[:3]) + origin = tuple(itk_image.GetOrigin()[:3]) + # FIXME: not sure... + direction = np.array(itk_image.GetDirection()) + direction = direction.reshape(3, 3) if itk_image.GetDimension() == 3 \ + else direction.reshape(4, 4) + + direction = direction[1:, 1:] + direction = tuple(direction.flatten()) + + data = sitk.GetArrayFromImage(itk_image) + + if data.ndim == 5: + data = np.transpose(data, (0, 3, 2, 1, 4)) + else: + data = np.transpose(data, (0, 3, 2, 1)) + data = np.expand_dims(data, axis=-1) + + if itk_image.GetDimension() > 5: + raise Exception + + t = origin + r = np.array(direction).reshape((3, 3)) + affine = np.dot(affine, + transforms3d.affines.compose(t, r, [1, 1, 1])) + + meta = { + "name": name, + "description": description, + "spacing": spacing, + "affine": affine, + "xyz_shape": data.shape[1:4], + "frame_count": data.shape[0], + "channel_count": data.shape[-1], + } + + return data, meta diff --git a/bioxelnodes/scipy/__init__.py b/bioxelnodes/bioxel/scipy/__init__.py similarity index 100% rename from bioxelnodes/scipy/__init__.py rename to bioxelnodes/bioxel/scipy/__init__.py diff --git a/bioxelnodes/scipy/_filters.py b/bioxelnodes/bioxel/scipy/_filters.py similarity index 100% rename from bioxelnodes/scipy/_filters.py rename to bioxelnodes/bioxel/scipy/_filters.py diff --git a/bioxelnodes/scipy/_interpolation.py b/bioxelnodes/bioxel/scipy/_interpolation.py similarity index 100% rename from bioxelnodes/scipy/_interpolation.py rename to bioxelnodes/bioxel/scipy/_interpolation.py diff --git a/bioxelnodes/scipy/_ni_support.py b/bioxelnodes/bioxel/scipy/_ni_support.py similarity index 100% rename from bioxelnodes/scipy/_ni_support.py rename to bioxelnodes/bioxel/scipy/_ni_support.py diff --git a/bioxelnodes/scipy/_utils.py b/bioxelnodes/bioxel/scipy/_utils.py similarity index 100% rename from bioxelnodes/scipy/_utils.py rename to bioxelnodes/bioxel/scipy/_utils.py diff --git a/bioxelnodes/skimage/__init__.py b/bioxelnodes/bioxel/skimage/__init__.py similarity index 100% rename from bioxelnodes/skimage/__init__.py rename to bioxelnodes/bioxel/skimage/__init__.py diff --git a/bioxelnodes/skimage/_utils.py b/bioxelnodes/bioxel/skimage/_utils.py similarity index 100% rename from bioxelnodes/skimage/_utils.py rename to bioxelnodes/bioxel/skimage/_utils.py diff --git a/bioxelnodes/skimage/_warps.py b/bioxelnodes/bioxel/skimage/_warps.py similarity index 100% rename from bioxelnodes/skimage/_warps.py rename to bioxelnodes/bioxel/skimage/_warps.py diff --git a/bioxelnodes/skimage/dtype.py b/bioxelnodes/bioxel/skimage/dtype.py similarity index 100% rename from bioxelnodes/skimage/dtype.py rename to bioxelnodes/bioxel/skimage/dtype.py diff --git a/bioxelnodes/bioxelutils/__init__.py b/bioxelnodes/bioxelutils/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/bioxelnodes/bioxelutils/container.py b/bioxelnodes/bioxelutils/container.py new file mode 100644 index 0000000..1f1dd8d --- /dev/null +++ b/bioxelnodes/bioxelutils/container.py @@ -0,0 +1,180 @@ +import bpy + +from ..bioxel.container import Container +from bpy_extras.io_utils import axis_conversion +from mathutils import Matrix, Vector + + +from .layer import Layer, get_container_layer_objs, layer_to_obj, obj_to_layer +from ..nodes import custom_nodes +from .node import get_nodes_by_type, move_node_to_node + + +NODE_TYPE = { + "label": "BioxelNodes_MaskByLabel", + "scalar": "BioxelNodes_MaskByThreshold" +} + + +def calc_bbox_verts(origin: tuple, size: tuple): + bbox_origin = Vector( + (origin[0], origin[1], origin[2])) + bbox_size = Vector( + (size[0], size[1], size[2])) + bbox_verts = [ + ( + bbox_origin[0] + 0, + bbox_origin[1] + 0, + bbox_origin[2] + 0 + ), + ( + bbox_origin[0] + 0, + bbox_origin[1] + 0, + bbox_origin[2] + bbox_size[2] + ), + ( + bbox_origin[0] + 0, + bbox_origin[1] + bbox_size[1], + bbox_origin[2] + 0 + ), + ( + bbox_origin[0] + 0, + bbox_origin[1] + bbox_size[1], + bbox_origin[2] + bbox_size[2] + ), + ( + bbox_origin[0] + bbox_size[0], + bbox_origin[1] + 0, + bbox_origin[2] + 0 + ), + ( + bbox_origin[0] + bbox_size[0], + bbox_origin[1] + 0, + bbox_origin[2] + bbox_size[2], + ), + ( + bbox_origin[0] + bbox_size[0], + bbox_origin[1] + bbox_size[1], + bbox_origin[2] + 0, + ), + ( + bbox_origin[0] + bbox_size[0], + bbox_origin[1] + bbox_size[1], + bbox_origin[2] + bbox_size[2], + ), + ] + return bbox_verts + + +def get_container_objs_from_selection(): + container_objs = [] + for obj in bpy.context.selected_objects: + if get_container_obj(obj): + container_objs.append(obj) + + return list(set(container_objs)) + + +def get_container_obj(current_obj): + if current_obj: + if current_obj.get('bioxel_container'): + return current_obj + elif current_obj.get('bioxel_layer'): + parent = current_obj.parent + return parent if parent.get('bioxel_container') else None + return None + + +def add_layers(layers: list[Layer], + container_obj: bpy.types.Object, + cache_dir: str): + + container_node_group = container_obj.modifiers[0].node_group + + for i, layer in enumerate(layers): + layer_obj = layer_to_obj(layer, container_obj, cache_dir) + mask_node = custom_nodes.add_node(container_node_group, + NODE_TYPE[layer.kind]) + mask_node.label = layer_obj.name + mask_node.inputs[0].default_value = layer_obj + + # Connect to output if no output linked + output_node = get_nodes_by_type(container_node_group, + 'NodeGroupOutput')[0] + if len(output_node.inputs[0].links) == 0: + container_node_group.links.new(mask_node.outputs[0], + output_node.inputs[0]) + move_node_to_node(mask_node, output_node, (-300, 0)) + else: + move_node_to_node(mask_node, output_node, (0, -100 * (i+1))) + + return container_obj + + +def obj_to_container(container_obj: bpy.types.Object): + layer_objs = get_container_layer_objs(container_obj) + layers = [obj_to_layer(obj) for obj in layer_objs] + container = Container(name=container_obj.name, + layers=layers) + return container + + +def container_to_obj(container: Container, + scene_scale: float, + cache_dir: str): + # Wrapper a Container + + # Make transformation + # (S)uperior -Z -> Y + # (A)osterior Y -> Z + mat_ras2blender = axis_conversion(from_forward='-Z', + from_up='Y', + to_forward='Y', + to_up='Z').to_4x4() + + mat_scene_scale = Matrix.Scale(scene_scale, + 4) + + bpy.ops.mesh.primitive_cube_add(enter_editmode=False, + align='WORLD', + location=(0, 0, 0), + scale=(1, 1, 1)) + + container_obj = bpy.context.active_object + + bbox_verts = calc_bbox_verts((0, 0, 0), container.layers[0].shape) + for i, vert in enumerate(container_obj.data.vertices): + transform = Matrix(container.layers[0].affine) + vert.co = transform @ Vector(bbox_verts[i]) + + container_obj.matrix_world = mat_ras2blender @ mat_scene_scale + container_obj.name = container.name + container_obj.data.name = container.name + container_obj.show_in_front = True + container_obj['bioxel_container'] = True + + bpy.ops.node.new_geometry_nodes_modifier() + container_node_group = container_obj.modifiers[0].node_group + input_node = get_nodes_by_type(container_node_group, + 'NodeGroupInput')[0] + container_node_group.links.remove( + input_node.outputs[0].links[0]) + + for i, layer in enumerate(container.layers): + layer_obj = layer_to_obj(layer, container_obj, cache_dir) + mask_node = custom_nodes.add_node(container_node_group, + NODE_TYPE[layer.kind]) + mask_node.label = layer_obj.name + mask_node.inputs[0].default_value = layer_obj + + # Connect to output if no output linked + output_node = get_nodes_by_type(container_node_group, + 'NodeGroupOutput')[0] + if len(output_node.inputs[0].links) == 0: + container_node_group.links.new(mask_node.outputs[0], + output_node.inputs[0]) + move_node_to_node(mask_node, output_node, (-300, 0)) + else: + move_node_to_node(mask_node, output_node, (0, -100 * (i+1))) + + return container_obj diff --git a/bioxelnodes/bioxelutils/layer.py b/bioxelnodes/bioxelutils/layer.py new file mode 100644 index 0000000..0936834 --- /dev/null +++ b/bioxelnodes/bioxelutils/layer.py @@ -0,0 +1,232 @@ +import random +import re +import bpy +import numpy as np + +import pyopenvdb as vdb +from pathlib import Path +from uuid import uuid4 + +from ..nodes import custom_nodes +from ..bioxel.layer import Layer +from .node import get_nodes_by_type, move_node_between_nodes + + +def get_layer_obj(current_obj: bpy.types.Object): + if current_obj: + if current_obj.get('bioxel_layer') and current_obj.parent: + if current_obj.parent.get('bioxel_container'): + return current_obj + return None + + +def get_container_layer_objs(container_obj: bpy.types.Object): + layer_objs = [] + for obj in bpy.context.scene.objects: + if obj.parent == container_obj and get_layer_obj(obj): + layer_objs.append(obj) + + return layer_objs + + +def get_all_layer_objs(): + layer_objs = [] + for obj in bpy.context.scene.objects: + if get_layer_obj(obj): + layer_objs.append(obj) + + return layer_objs + + +def obj_to_layer(layer_obj: bpy.types.Object): + cache_filepath = Path(bpy.path.abspath(layer_obj.data.filepath)).resolve() + is_sequence = re.search(r'\.\d{4}\.', + cache_filepath.name) is not None + if is_sequence: + cache_path = cache_filepath.parent + data_frames = () + for f in cache_path.iterdir(): + if not f.is_file() or f.suffix != ".vdb": + continue + grids, base_metadata = vdb.readAll(str(f)) + grid = grids[0] + metadata = grid.metadata + data_frame = np.ndarray(grid["data_shape"], np.float32) + grid.copyToArray(data_frame) + data_frames += (data_frame,) + data = np.stack(data_frames) + else: + grids, base_metadata = vdb.readAll(str(cache_filepath)) + grid = grids[0] + metadata = grid.metadata + data = np.ndarray(grid["data_shape"], np.float32) + grid.copyToArray(data) + data = np.expand_dims(data, axis=0) # expend frame + + name = metadata["layer_name"] + kind = metadata["layer_kind"] + affine = metadata["layer_affine"] + dtype = metadata.get("data_dtype") or "float32" + offset = metadata.get("data_offset") or 0 + data = data - np.full_like(data, offset) + data = data.astype(dtype) + + if kind in ["scalar", "label"]: + data = np.expand_dims(data, axis=-1) # expend channel + + layer = Layer(data=data, + name=name, + kind=kind, + affine=affine) + + return layer + + +def layer_to_obj(layer: Layer, + container_obj: bpy.types.Object, + cache_dir: str): + + data = layer.data + + # TXYZC > TXYZ + if layer.kind in ['label', 'scalar']: + data = np.amax(data, -1) + + offset = 0 + if layer.kind in ['scalar']: + data = data.astype(np.float32) + orig_min = float(np.min(data)) + if orig_min < 0: + offset = -orig_min + + data = data + np.full_like(data, offset) + + metadata = { + "layer_name": layer.name, + "layer_kind": layer.kind, + "layer_affine": layer.affine.tolist(), + "data_shape": layer.shape, + "data_dtype": layer.data.dtype.str, + "data_offset": offset + } + + if layer.frame_count > 1: + print(f"Saving the Cache of {layer.name}...") + vdb_name = str(uuid4()) + sequence_path = Path(cache_dir, vdb_name) + sequence_path.mkdir(parents=True, exist_ok=True) + + cache_filepaths = [] + for f in range(layer.frame_count): + grid = vdb.FloatGrid() + grid.copyFromArray(data[f, :, :, :].copy().astype(np.float32)) + grid.transform = vdb.createLinearTransform( + layer.affine.transpose()) + grid.metadata = metadata + grid.name = layer.kind + + cache_filepath = Path(sequence_path, + f"{vdb_name}.{str(f+1).zfill(4)}.vdb") + vdb.write(str(cache_filepath), grids=[grid]) + cache_filepaths.append(cache_filepath) + + print(f"Loading the Cache of {layer.name}...") + files = [{"name": str(cache_filepath.name), "name": str(cache_filepath.name)} + for cache_filepath in cache_filepaths] + + bpy.ops.object.volume_import(filepath=str(cache_filepaths[0]), + directory=str(cache_filepaths[0].parent), + files=files, align='WORLD', location=(0, 0, 0), scale=(1, 1, 1)) + + else: + grid = vdb.FloatGrid() + grid.copyFromArray(data[0, :, :, :].copy().astype(np.float32)) + grid.transform = vdb.createLinearTransform( + layer.affine.transpose()) + grid.metadata = metadata + grid.name = layer.kind + + print(f"Saving the Cache of {layer.name}...") + cache_filepath = Path(cache_dir, f"{uuid4()}.vdb") + vdb.write(str(cache_filepath), grids=[grid]) + cache_filepaths = [cache_filepath] + + print(f"Loading the Cache of {layer.name}...") + bpy.ops.object.volume_import(filepath=str(cache_filepaths[0]), + align='WORLD', location=(0, 0, 0), scale=(1, 1, 1)) + + layer_obj = bpy.context.active_object + layer_obj.data.sequence_mode = 'REPEAT' + + # Set props to VDB object + layer_obj.name = f"{container_obj.name}_{layer.name}" + layer_obj.data.name = f"{container_obj.name}_{layer.name}" + + layer_obj.lock_location[0] = True + layer_obj.lock_location[1] = True + layer_obj.lock_location[2] = True + layer_obj.lock_rotation[0] = True + layer_obj.lock_rotation[1] = True + layer_obj.lock_rotation[2] = True + layer_obj.lock_scale[0] = True + layer_obj.lock_scale[1] = True + layer_obj.lock_scale[2] = True + + layer_obj.visible_camera = False + layer_obj.visible_diffuse = False + layer_obj.visible_glossy = False + layer_obj.visible_transmission = False + layer_obj.visible_volume_scatter = False + layer_obj.visible_shadow = False + + layer_obj.hide_select = True + layer_obj.hide_render = True + layer_obj.hide_viewport = True + + layer_obj['bioxel_layer'] = True + layer_obj.parent = container_obj + + for collection in layer_obj.users_collection: + collection.objects.unlink(layer_obj) + + for collection in container_obj.users_collection: + collection.objects.link(layer_obj) + + print(f"Creating Node for {layer.name}...") + bpy.ops.node.new_geometry_nodes_modifier() + node_group = layer_obj.modifiers[0].node_group + layer_node = custom_nodes.add_node(node_group, + "BioxelNodes__Layer") + + layer_node.inputs['name'].default_value = layer.name + layer_node.inputs['shape'].default_value = layer.shape + layer_node.inputs['kind'].default_value = layer.kind + + for i in range(layer.affine.shape[1]): + for j in range(layer.affine.shape[0]): + affine_key = f"affine{i}{j}" + layer_node.inputs[affine_key].default_value = layer.affine[j, i] + + layer_node.inputs['id'].default_value = random.randint(-200000000, + 200000000) + layer_node.inputs['bioxel_size'].default_value = layer.bioxel_size[0] + layer_node.inputs['dtype'].default_value = layer.dtype.str + layer_node.inputs['dtype_num'].default_value = layer.dtype.num + layer_node.inputs['offset'].default_value = max(0, -layer.min) + layer_node.inputs['min'].default_value = layer.min + layer_node.inputs['max'].default_value = layer.max + + input_node = get_nodes_by_type(node_group, + 'NodeGroupInput')[0] + output_node = get_nodes_by_type(node_group, + 'NodeGroupOutput')[0] + + node_group.links.new(input_node.outputs[0], + layer_node.inputs[0]) + node_group.links.new(layer_node.outputs[0], + output_node.inputs[0]) + + move_node_between_nodes( + layer_node, [input_node, output_node]) + + return layer_obj diff --git a/bioxelnodes/bioxelutils/node.py b/bioxelnodes/bioxelutils/node.py new file mode 100644 index 0000000..bbea981 --- /dev/null +++ b/bioxelnodes/bioxelutils/node.py @@ -0,0 +1,26 @@ +def move_node_to_node(node, target_node, offset=(0, 0)): + node.location.x = target_node.location.x + offset[0] + node.location.y = target_node.location.y + offset[1] + + +def move_node_between_nodes(node, target_nodes, offset=(0, 0)): + xs = [] + ys = [] + for target_node in target_nodes: + xs.append(target_node.location.x) + ys.append(target_node.location.y) + + node.location.x = sum(xs) / len(xs) + offset[0] + node.location.y = sum(ys) / len(ys) + offset[1] + + +def get_node_type(node): + node_type = type(node).__name__ + if node_type == "GeometryNodeGroup": + node_type = node.node_tree.name + + return node_type + + +def get_nodes_by_type(node_group, type_name: str): + return [node for node in node_group.nodes if get_node_type(node) == type_name] diff --git a/bioxelnodes/blender_manifest.toml b/bioxelnodes/blender_manifest.toml new file mode 100644 index 0000000..66aaf2d --- /dev/null +++ b/bioxelnodes/blender_manifest.toml @@ -0,0 +1,38 @@ +schema_version = "1.0.0" + +id = "bioxelnodes" +version = "0.3.0" +name = "Bioxel Nodes" +tagline = "For scientific volumetric data visualization in Blender" +maintainer = "Ma Nan " +type = "add-on" +website = "https://omoolab.github.io/BioxelNodes/latest" + +tags = ["Geometry Nodes", "Render", "Import-Export"] +blender_version_min = "4.2.0" +license = ["SPDX:MIT"] +copyright = ["2024 OmooLab"] +platforms = ["windows-x64", "linux-x64", "macos-arm64", "macos-x64"] + +wheels = [ + "./wheels/SimpleITK-2.3.1-cp311-cp311-win_amd64.whl", + "./wheels/SimpleITK-2.3.1-cp311-cp311-macosx_10_9_x86_64.whl", + "./wheels/SimpleITK-2.3.1-cp311-cp311-macosx_11_0_arm64.whl", + "./wheels/SimpleITK-2.3.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", + "./wheels/lxml-5.2.2-cp311-cp311-win_amd64.whl", + "./wheels/lxml-5.2.2-cp311-cp311-macosx_10_9_universal2.whl", + "./wheels/lxml-5.2.2-cp311-cp311-macosx_10_9_x86_64.whl", + "./wheels/lxml-5.2.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", + "./wheels/h5py-3.11.0-cp311-cp311-win_amd64.whl", + "./wheels/h5py-3.11.0-cp311-cp311-macosx_11_0_arm64.whl", + "./wheels/h5py-3.11.0-cp311-cp311-macosx_10_9_x86_64.whl", + "./wheels/h5py-3.11.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", + "./wheels/tifffile-2024.7.24-py3-none-any.whl", + "./wheels/pyometiff-1.0.0-py3-none-any.whl", + "./wheels/mrcfile-1.5.1-py2.py3-none-any.whl", + "./wheels/transforms3d-0.4.2-py3-none-any.whl", +] + +[permissions] +files = "Import/export volume data from/to disk" + diff --git a/bioxelnodes/customnodes/menus.py b/bioxelnodes/customnodes/menus.py index 5dc4700..afe1c7a 100644 --- a/bioxelnodes/customnodes/menus.py +++ b/bioxelnodes/customnodes/menus.py @@ -1,4 +1,3 @@ -import shutil import bpy from pathlib import Path from .nodes import AddCustomNode diff --git a/bioxelnodes/customnodes/nodes.py b/bioxelnodes/customnodes/nodes.py index b1d0d44..8f7652b 100644 --- a/bioxelnodes/customnodes/nodes.py +++ b/bioxelnodes/customnodes/nodes.py @@ -94,6 +94,7 @@ def add_node(self, node_group): self.get_node_tree(self.node_type, self.node_link) node = node_group.nodes.new("GeometryNodeGroup") self.assign_node_tree(node) + node.show_options = False return node @@ -121,5 +122,6 @@ def execute(self, context): node = bpy.context.active_node self.assign_node_tree(node) + node.show_options = False return {"FINISHED"} diff --git a/bioxelnodes/externalpackage/__init__.py b/bioxelnodes/externalpackage/__init__.py deleted file mode 100644 index a46ad0f..0000000 --- a/bioxelnodes/externalpackage/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from .preferences import ExternalPackagePreferences -from .package import PackageInstaller diff --git a/bioxelnodes/externalpackage/package.py b/bioxelnodes/externalpackage/package.py deleted file mode 100644 index d0faf59..0000000 --- a/bioxelnodes/externalpackage/package.py +++ /dev/null @@ -1,393 +0,0 @@ -""" -Handling installation of external python packages inside of Blender's bundled python. -""" -import subprocess -import sys -import logging -from importlib.metadata import version as get_version, PackageNotFoundError -import bpy -from pathlib import Path - -ADDON_NAME = __package__.split(".")[0] - -PYPI_MIRROR = { - # the original. - 'Default': '', - # two mirrors in China Mainland to help those poor victims under GFW. - 'BFSU (Beijing)': 'https://mirrors.bfsu.edu.cn/pypi/web/simple', - 'TUNA (Beijing)': 'https://pypi.tuna.tsinghua.edu.cn/simple', - # append more if necessary. -} - - -class InstallationError(Exception): - """ - Exception raised when there is an error installing a package. - - Attributes - ---------- - package_name : str - The name of the package that failed to install. - error_message : str - The error message returned by pip. - - """ - - def __init__(self, package_name, error_message): - self.package_name = package_name - self.error_message = error_message - super().__init__(f"Failed to install {package_name}: {error_message}") - - -class PackageInstaller(): - def __init__( - self, - requirements_dir: str, - log_dir: str = None, - pypi_mirror_provider='Default', - ) -> None: - self.pypi_mirror_provider = pypi_mirror_provider - self.log_path: Path = Path(log_dir) if log_dir \ - else Path.home() / '.externalpackage' / 'logs' - self.requirements_path: Path = Path(requirements_dir) - - def start_logging(self, logfile_name: str = 'side-packages-install') -> logging.Logger: - """ - Configure and start logging to a file. - - Parameters - ---------- - logfile_name : str, optional - The name of the log file. Defaults to 'side-packages-install'. - - Returns - ------- - logging.Logger - A Logger object that can be used to write log messages. - - This function sets up a logging configuration with a specified log file name and logging level. - The log file will be created in the `ADDON_DIR/logs` directory. If the directory - does not exist, it will be created. The function returns a Logger object that can be used to - write log messages. - - """ - # Create the logs directory if it doesn't exist - self.log_path.mkdir(parents=True, exist_ok=True) - - # Set up logging configuration - logfile_path = Path(self.log_path, f"{logfile_name}.log") - logging.basicConfig(filename=logfile_path, - level=logging.INFO, encoding='utf-8') - - # Return logger object - return logging.getLogger() - - @property - def pypi_mirror_url(self) -> str: - """ - Process a PyPI mirror provider and return the corresponding URL. - - Parameters - ---------- - pypi_mirror_provider : str - The PyPI mirror provider to process. - - Returns - ------- - str - The URL of the PyPI mirror. - - Raises - ------ - ValueError - If the provided PyPI mirror provider is invalid. - - """ - if self.pypi_mirror_provider.startswith('https:'): - return self.pypi_mirror_provider - elif self.pypi_mirror_provider in PYPI_MIRROR.keys(): - return PYPI_MIRROR[self.pypi_mirror_provider] - else: - raise ValueError( - f"Invalid PyPI mirror provider: {self.pypi_mirror_provider}") - - @property - def packages(self) -> dict: - """ - Read a requirements file and extract package information into a dictionary. - - Parameters - ---------- - requirements : str, optional - The path to the requirements file. If not provided, the function looks for a `requirements.txt` - file in the same directory as the script. - - Returns - ------- - dict - A dictionary containing package information. Each element of the dictionary is a dictionary containing the package name, version, and description. - - Example - ------- - Given the following requirements file: - ```python - Flask==1.1.2 # A micro web framework for Python - pandas==1.2.3 # A fast, powerful, flexible, and easy-to-use data analysis and manipulation tool - numpy==1.20.1 # Fundamental package for scientific computing - ``` - The function would return the following dictionary: - ```python - [ - { - "package": "Flask", - "version": "1.1.2", - "description": "A micro web framework for Python" - }, - { - "package": "pandas", - "version": "1.2.3", - "description": "A fast, powerful, flexible, and easy-to-use data analysis and manipulation tool" - }, - { - "package": "numpy", - "version": "1.20.1", - "description": "Fundamental package for scientific computing" - } - ] - ``` - """ - requirements_filepath = self.requirements_path / "requirements.txt" - if requirements_filepath.is_file(): - with requirements_filepath.open('r') as f: - lines = f.read().splitlines() - packages = {} - for line in lines: - try: - package, description = line.split('#') - package_meta = package.split('==') - name = package_meta[0].strip() - packages[name] = { - "name": name, - "version": package_meta[1].strip(), - "description": description.strip() - } - except ValueError: - # Skip line if it doesn't have the expected format - pass - return packages - else: - raise FileNotFoundError(requirements_filepath) - - def is_installed(self, package_name: str) -> bool: - """ - Check if the specified package is installed and the version matches that specified - in the `requirements.txt` file. - - Parameters - ---------- - package : str - The name of the package to check. - - Returns - ------- - bool - True if the package is the current version, False otherwise. - - """ - package = self.packages.get(package_name) - try: - available_version = get_version(package['name']) - return available_version == package['version'] - except PackageNotFoundError: - return False - - def run_python(self, cmd_list: list = None, timeout: int = 600): - """ - Runs pip command using the specified command list and returns the command output. - - Parameters - ---------- - cmd_list : list, optional - List of pip commands to be executed. Defaults to None. - mirror_url : str, optional - URL of a package repository mirror to be used for the command. Defaults to ''. - timeout : int, optional - Time in seconds to wait for the command to complete. Defaults to 600. - - Returns - ------- - tuple - A tuple containing the command list, command return code, command standard output, - and command standard error. - - Example - ------- - Install numpy using pip and print the command output - ```python - cmd_list = ["-m", "pip", "install", "numpy"] - mirror_url = 'https://pypi.org/simple/' - cmd_output = run_python(cmd_list, timeout=300) - print(cmd_output) - ``` - - """ - - # path to python.exe - python_exe = str(Path(sys.executable).resolve()) - - # build the command list - cmd_list = [python_exe] + cmd_list - - # add mirror to the command list if it's valid - if self.pypi_mirror_url and self.pypi_mirror_url.startswith('https'): - cmd_list += ['-i', self.pypi_mirror_url] - - log = self.start_logging() - log.info(f"Running Pip: '{cmd_list}'") - - # run the command and capture the output - result = subprocess.run(cmd_list, timeout=timeout, - stdout=subprocess.PIPE, stderr=subprocess.PIPE) - - try: - if result.returncode != 0: - log.error('Command failed: %s', cmd_list) - log.error('stdout: %s', result.stdout.decode()) - log.error('stderr: %s', result.stderr.decode(errors='ignore')) - else: - log.info('Command succeeded: %s', cmd_list) - log.info('stdout: %s', result.stdout.decode()) - except: - ... - # return the command list, return code, stdout, and stderr as a tuple - return result - - def install_package(self, package: str) -> list: - """ - Install a Python package and its dependencies using pip. - - Parameters - ---------- - package : str - The name of the package to install. - pypi_mirror_provider : str, optional - The name/url of the PyPI mirror provider to use. Default is 'Default'. - - Returns - ------- - list - A list of tuples containing the command list, return code, stdout, and stderr - for each pip command run. - - Raises - ------ - ValueError - If the package name is not provided. - - Example - ------- - To install the package 'requests' from the PyPI mirror 'MyMirror', use: - ``` - install_package('requests', 'MyMirror') - ``` - - """ - if not package: - raise ValueError("Package name must be provided.") - - print(f"Installing {package}...") - print(f"Using PyPI mirror: {self.pypi_mirror_provider}") - - self.run_python(["-m", "ensurepip"]), - self.run_python(["-m", "pip", "install", "--upgrade", "pip"]) - result = self.run_python(["-m", "pip", "install", package, "--user"]) - - return result - - def install_all_packages(self, pypi_mirror_provider: str = 'Default') -> list: - """ - Install all packages listed in the 'requirements.txt' file. - - Parameters - ---------- - pypi_mirror_provider : str, optional - The PyPI mirror to use for package installation. Defaults to 'Default', - which uses the official PyPI repository. - - Returns - ------- - list - A list of tuples containing the installation results for each package. - - Raises - ------ - InstallationError - If there is an error during package installation. - - Example - ------- - To install all packages listed in the 'requirements.txt' file, run the following command: - ``` - install_all_packages(pypi_mirror_provider='https://pypi.org/simple/') - ``` - - """ - results = [] - for package in self.packages.items(): - - try: - result = self.install_package( - package=f"{package.get('name')}=={package.get('version')}" - ) - results.append(result) - except InstallationError as e: - raise InstallationError( - f"Error installing package {package.get('name')}: {str(e)}") - return results - - -class EXTERNALPACKAGE_OT_Install_Package(bpy.types.Operator): - bl_idname = 'externalpackage.install_package' - bl_label = 'Install Given Python Package' - bl_options = {'REGISTER', 'INTERNAL'} - - package: bpy.props.StringProperty( - name='Python Package', - description='Python Package to Install' - ) # type: ignore - - version: bpy.props.StringProperty( - name='Python Package', - description='Python Package to Install' - ) # type: ignore - - description: bpy.props.StringProperty( - name='Operator description', - default='Install specified python package.' - ) # type: ignore - - @classmethod - def description(cls, context, properties): - return properties.description - - def execute(self, context): - preferences = context.preferences.addons[ADDON_NAME].preferences - installer = PackageInstaller( - pypi_mirror_provider=preferences.pypi_mirror_provider, - log_dir=preferences.log_dir, - requirements_dir=preferences.requirements_dir - ) - - result = installer.install_package(f"{self.package}=={self.version}") - if result.returncode == 0 or installer.is_installed(self.package): - self.report( - {'INFO'}, - f"Successfully installed {self.package} v{self.version}" - ) - else: - self.report( - {'ERROR'}, - f"""Error installing package. Please check the log files -in {preferences.log_dir}.""" - ) - return {'FINISHED'} diff --git a/bioxelnodes/externalpackage/preferences.py b/bioxelnodes/externalpackage/preferences.py deleted file mode 100644 index f15aff8..0000000 --- a/bioxelnodes/externalpackage/preferences.py +++ /dev/null @@ -1,95 +0,0 @@ -import bpy -import subprocess -from pathlib import Path -from .package import PackageInstaller, PYPI_MIRROR - -# Defines the preferences panel for the addon, which shows the buttons for -# installing and reinstalling the required python packages defined in 'requirements.txt' - - -def get_pypi_mirrors(self, context, edit_text): - return PYPI_MIRROR.keys() - - -class RebootBlender(bpy.types.Operator): - bl_idname = "externalpackage.reboot_blender" - bl_label = "Reboot Blender" - bl_description = "Reboot Blender" - bl_options = {'UNDO'} - - def invoke(self, context, event): - context.window_manager.invoke_confirm(self, event) - return {'RUNNING_MODAL'} - - def execute(self, context): - blender_launcher = Path( - bpy.app.binary_path).parent / "blender-launcher.exe" - subprocess.run([str(blender_launcher), "-con", "--python-expr", - "import bpy; bpy.ops.wm.recover_last_session()"]) - bpy.ops.wm.quit_blender() - return {'FINISHED'} - - -class ExternalPackagePreferences(): - requirements_dir: bpy.props.StringProperty( - name="requirements.txt Directory", - subtype='DIR_PATH', - default=str(Path(__file__).parent) - ) # type: ignore - - log_dir: bpy.props.StringProperty( - name="Python Log Directory", - subtype='DIR_PATH', - default=str(Path(Path.home(), '.externalpackage', 'logs')) - ) # type: ignore - - pypi_mirror_provider: bpy.props.StringProperty( - name='pypi_mirror_provider', - description='PyPI Mirror Provider', - options={'TEXTEDIT_UPDATE', 'LIBRARY_EDITABLE'}, - default='Default', - subtype='NONE', - search=get_pypi_mirrors, - ) # type: ignore - - def draw(self, context): - layout = self.layout - layout.label( - text='**Install the required packages, then hit "Reboot Blender"**') - - col_main = layout.column(heading='', align=False) - row_import = col_main.row() - row_import.prop(self, 'pypi_mirror_provider', text='PyPI Mirror') - - installer = PackageInstaller( - pypi_mirror_provider=self.pypi_mirror_provider, - log_dir=self.log_dir, - requirements_dir=self.requirements_dir - ) - - for package in installer.packages.values(): - - name = package.get('name') - version = package.get('version') - description = package.get('description') - - if installer.is_installed(name): - row = layout.row() - row.label(text=f"{name} version {version} is installed.") - op = row.operator('externalpackage.install_package', - text=f'Reinstall {name}') - op.package = name - op.version = version - op.description = f'Reinstall {name}' - else: - row = layout.row(heading=f"Package: {name}") - col = row.column() - col.label(text=str(description)) - col = row.column() - op = col.operator('externalpackage.install_package', - text=f'Install {name}') - op.package = name - op.version = version - op.description = f'Install required python package: {name}' - - layout.operator(RebootBlender.bl_idname) diff --git a/bioxelnodes/io.py b/bioxelnodes/io.py deleted file mode 100644 index f68b4ba..0000000 --- a/bioxelnodes/io.py +++ /dev/null @@ -1,953 +0,0 @@ -import math -import bpy -import shutil -import threading - - -from bpy_extras.io_utils import axis_conversion -import pyopenvdb as vdb -import numpy as np -from pathlib import Path -import mathutils -import random - -from . import skimage as ski -from .nodes import custom_nodes -from .exceptions import CancelledByUser -from .props import BIOXELNODES_Series -from .parse import DICOM_EXTS, FH_EXTS, SUPPORT_EXTS, get_ext, parse_volumetric_data -from .utils import (calc_bbox_verts, get_all_layers, get_container_from_selection, get_layer, - get_nodes_by_type, hide_in_ray, lock_transform, move_node_between_nodes, move_node_to_node, progress_update, progress_bar, save_vdb, save_vdbs, select_object) - - -try: - import SimpleITK as sitk -except: - ... - - -def get_layer_shape(bioxel_size: float, orig_shape: tuple, orig_spacing: tuple): - shape = (int(orig_shape[0] / bioxel_size * orig_spacing[0]), - int(orig_shape[1] / bioxel_size * orig_spacing[1]), - int(orig_shape[2] / bioxel_size * orig_spacing[2])) - - return (shape[0] if shape[0] > 0 else 1, - shape[1] if shape[1] > 0 else 1, - shape[2] if shape[2] > 0 else 1) - - -def get_layer_size(shape: tuple, bioxel_size: float, scale: float = 1.0): - size = (float(shape[0] * bioxel_size * scale), - float(shape[1] * bioxel_size * scale), - float(shape[2] * bioxel_size * scale)) - - return size - - -""" -ImportVolumetricData - -> ParseVolumetricData -> ImportVolumetricDataDialog -FH_ImportVolumetricData - - start import parse data execute import -""" - - -class ImportVolumetricData(): - bl_options = {'UNDO'} - - filepath: bpy.props.StringProperty(subtype="FILE_PATH") # type: ignore - directory: bpy.props.StringProperty(subtype='DIR_PATH') # type: ignore - - read_as = "scalar" - - def execute(self, context): - containers = get_container_from_selection() - - if len(containers) > 0: - bpy.ops.bioxelnodes.parse_volumetric_data('INVOKE_DEFAULT', - filepath=self.filepath, - directory=self.directory, - container=containers[0].name, - read_as=self.read_as) - else: - bpy.ops.bioxelnodes.parse_volumetric_data('INVOKE_DEFAULT', - filepath=self.filepath, - directory=self.directory, - read_as=self.read_as) - - return {'FINISHED'} - - def invoke(self, context, event): - context.window_manager.fileselect_add(self) - return {'RUNNING_MODAL'} - - -class ImportAsScalarLayer(bpy.types.Operator, ImportVolumetricData): - bl_idname = "bioxelnodes.import_as_scalar_layer" - bl_label = "Import as Scalar" - bl_description = "Import Volumetric Data to Container as Scalar" - read_as = "scalar" - - -class ImportAsLabelLayer(bpy.types.Operator, ImportVolumetricData): - bl_idname = "bioxelnodes.import_as_label_layer" - bl_label = "Import as Label" - bl_description = "Import Volumetric Data to Container as Label" - read_as = "label" - - -try: - class BIOXELNODES_FH_ImportVolumetricData(bpy.types.FileHandler): - bl_idname = "BIOXELNODES_FH_ImportVolumetricData" - bl_label = "File handler for dicom import" - bl_import_operator = "bioxelnodes.parse_volumetric_data" - bl_file_extensions = ";".join(FH_EXTS) - - @classmethod - def poll_drop(cls, context): - return (context.area and context.area.type == 'VIEW_3D') -except: - ... - - -def get_series_ids(self, context): - items = [] - for index, series_id in enumerate(self.series_ids): - items.append(( - series_id.id, - series_id.label, - "", - index - )) - - return items - - -class ParseVolumetricData(bpy.types.Operator): - bl_idname = "bioxelnodes.parse_volumetric_data" - bl_label = "Import Volumetric Data" - bl_description = "Import Volumetric Data as Layer" - bl_options = {'UNDO'} - - meta = {} - thread = None - _timer = None - - progress: bpy.props.FloatProperty(name="Progress", - options={"SKIP_SAVE"}, - default=1) # type: ignore - - filepath: bpy.props.StringProperty(subtype="FILE_PATH") # type: ignore - directory: bpy.props.StringProperty(subtype='DIR_PATH') # type: ignore - container: bpy.props.StringProperty() # type: ignore - - read_as: bpy.props.EnumProperty(name="Read as", - default="scalar", - items=[("scalar", "Scalar", ""), - ("label", "Labels", "")]) # type: ignore - - series_id: bpy.props.EnumProperty(name="Select Series", - items=get_series_ids) # type: ignore - - series_ids: bpy.props.CollectionProperty( - type=BIOXELNODES_Series) # type: ignore - - def execute(self, context): - ext = get_ext(self.filepath) - if ext not in SUPPORT_EXTS: - self.report({"WARNING"}, "Not supported extension.") - return {'CANCELLED'} - - print("Collecting Meta Data...") - - def parse_volumetric_data_func(self, context, cancel): - - def progress_callback(factor, text): - if cancel(): - return False - progress_update(context, factor, text) - return True - - try: - volume, meta = parse_volumetric_data(filepath=self.filepath, - series_id=self.series_id, - progress_callback=progress_callback) - except CancelledByUser: - return - except RuntimeError: - self.has_error = True - return - - if cancel(): - return - - self.meta = meta - - # Init cancel flag - self.is_cancelled = False - self.has_error = False - - # Create the thread - self.thread = threading.Thread(target=parse_volumetric_data_func, - args=(self, context, lambda: self.is_cancelled)) - - # Start the thread - self.thread.start() - # Add a timmer for modal - self._timer = context.window_manager.event_timer_add(time_step=0.1, - window=context.window) - # Append progress bar to status bar - bpy.types.STATUSBAR_HT_header.append(progress_bar) - - # Start modal handler - context.window_manager.modal_handler_add(self) - return {'RUNNING_MODAL'} - - def modal(self, context, event): - # Check if user press 'ESC' - if event.type == 'ESC': - self.is_cancelled = True - progress_update(context, 0, "Canceling...") - return {'PASS_THROUGH'} - - # Check if is the timer time - if event.type != 'TIMER': - return {'PASS_THROUGH'} - - # Force update status bar - bpy.context.workspace.status_text_set_internal(None) - - # Check if thread is still running - if self.thread.is_alive(): - return {'PASS_THROUGH'} - - # Release the thread - self.thread.join() - # Remove the timer - context.window_manager.event_timer_remove(self._timer) - # Remove the progress bar from status bar - bpy.types.STATUSBAR_HT_header.remove(progress_bar) - - # Check if thread is cancelled by user - if self.is_cancelled: - self.report({"WARNING"}, "Canncelled by user.") - return {'CANCELLED'} - - # Check if thread is cancelled by user - if self.has_error: - self.report({"ERROR"}, "Fail to parse, something went wrong.") - return {'CANCELLED'} - - # If not canncelled... - for key, value in self.meta.items(): - print(f"{key}: {value}") - - orig_shape = self.meta['shape'] - orig_spacing = self.meta['spacing'] - min_size = min(orig_spacing[0], - orig_spacing[1], orig_spacing[2]) - bioxel_size = max(min_size, 1.0) - - layer_shape = get_layer_shape(1, orig_shape, orig_spacing) - layer_size = get_layer_size(layer_shape, - bioxel_size) - log10 = math.floor(math.log10(max(*layer_size))) - log10 = max(1,log10) - log10 = min(3,log10) - scene_scale = math.pow(10, -log10) - - if self.container: - container = bpy.data.objects[self.container] - container_name = container.name - else: - container_name = self.meta['name'] - - bpy.ops.bioxelnodes.import_volumetric_data_dialog( - 'INVOKE_DEFAULT', - filepath=self.filepath, - container_name=container_name, - layer_name=self.meta['description'], - orig_shape=orig_shape, - orig_spacing=orig_spacing, - bioxel_size=bioxel_size, - series_id=self.series_id or "", - frame_count=self.meta['frame_count'], - channel_count=self.meta['channel_count'], - container=self.container, - read_as=self.read_as, - scene_scale=scene_scale - ) - - self.report({"INFO"}, "Successfully Readed.") - return {'FINISHED'} - - def invoke(self, context, event): - if not self.filepath and not self.directory: - return {'CANCELLED'} - - ext = get_ext(self.filepath) - - # Series Selection - if ext in DICOM_EXTS: - dir_path = Path(self.filepath).parent - reader = sitk.ImageSeriesReader() - reader.MetaDataDictionaryArrayUpdateOn() - reader.LoadPrivateTagsOn() - - series_ids = reader.GetGDCMSeriesIDs(str(dir_path)) - - for series_id in series_ids: - series_files = reader.GetGDCMSeriesFileNames( - str(dir_path), series_id) - single = sitk.ImageFileReader() - single.SetFileName(series_files[0]) - single.LoadPrivateTagsOn() - single.ReadImageInformation() - - def get_meta(key): - try: - stirng = single.GetMetaData(key).removesuffix(" ") - if stirng in ["No study description", - "No series description"]: - return "Unknown" - else: - return stirng - except: - return "Unknown" - - study_description = get_meta("0008|1030") - series_description = get_meta("0008|103e") - series_modality = get_meta("0008|0060") - size_x = get_meta("0028|0011") - size_y = get_meta("0028|0010") - count = get_meta("0020|0013") - - # some series image count = 0 ???? - if int(count) == 0: - continue - - series_item = self.series_ids.add() - series_item.id = series_id - series_item.label = "{:<20} {:>1}".format(f"{study_description}>{series_description}({series_modality})", - f"({size_x}x{size_y})x{count}") - - if len(series_ids) > 1: - context.window_manager.invoke_props_dialog(self, - width=400, - title="Which series to import?") - return {'RUNNING_MODAL'} - else: - self.series_id = series_ids[0] - - self.execute(context) - return {'RUNNING_MODAL'} - - def draw(self, context): - layout = self.layout - layout.label( - text='Detect multi-series in DICOM, pick one') - layout.prop(self, "series_id") - - -class ImportVolumetricDataDialog(bpy.types.Operator): - bl_idname = "bioxelnodes.import_volumetric_data_dialog" - bl_label = "Import Volumetric Data" - bl_description = "Import Volumetric Data as Layer" - bl_options = {'UNDO'} - - layers = [] - thread = None - _timer = None - - filepath: bpy.props.StringProperty(subtype="FILE_PATH") # type: ignore - - container_name: bpy.props.StringProperty( - name="Container Name") # type: ignore - - layer_name: bpy.props.StringProperty(name="Layer Name") # type: ignore - - series_id: bpy.props.StringProperty() # type: ignore - - container: bpy.props.StringProperty() # type: ignore - - frame_count: bpy.props.IntProperty() # type: ignore - - channel_count: bpy.props.IntProperty() # type: ignore - - read_as: bpy.props.EnumProperty(name="Read as", - default="scalar", - items=[("scalar", "Scalar", ""), - ("label", "Labels", "")]) # type: ignore - - bioxel_size: bpy.props.FloatProperty(name="Bioxel Size (Larger size means small resolution)", - soft_min=0.1, soft_max=10.0, - min=0.1, max=1e2, - default=1) # type: ignore - - orig_spacing: bpy.props.FloatVectorProperty(name="Original Spacing", - default=(1, 1, 1)) # type: ignore - - orig_shape: bpy.props.IntVectorProperty(name="Original Shape", - default=(100, 100, 100)) # type: ignore - - scene_scale: bpy.props.FloatProperty(name="Scene Scale (Bioxel Unit pre Blender Unit)", - soft_min=0.0001, soft_max=10.0, - min=1e-6, max=1e6, - default=0.01) # type: ignore - - as_time_sequence: bpy.props.BoolProperty(name="As Time Sequence", - default=False) # type: ignore - - split_channels: bpy.props.BoolProperty(name="Split Channels", - default=False) # type: ignore - - def execute(self, context): - def import_volumetric_data_func(self, context, cancel): - progress_update(context, 0.0, "Parsing Volumetirc Data...") - - def progress_callback(factor, text): - if cancel(): - return False - progress_update(context, factor*0.2, text) - return True - - try: - volume, meta = parse_volumetric_data(filepath=self.filepath, - series_id=self.series_id, - progress_callback=progress_callback) - except CancelledByUser: - return - - if cancel(): - return - - layer_shape = get_layer_shape(self.bioxel_size, - meta['shape'], - self.orig_spacing) - layer_dtype = volume.dtype.num - - # After sitk.DICOMOrient(), origin and direction will also orient base on LPS - # so we need to convert them into RAS - mat_lps2ras = axis_conversion(from_forward='-Z', - from_up='-Y', - to_forward='-Z', - to_up='Y').to_4x4() - - mat_location = mathutils.Matrix.Translation( - mathutils.Vector(meta['origin']) - ) - - mat_rotation = mathutils.Matrix( - np.array(meta['direction']).reshape((3, 3)) - ).to_4x4() - - mat_scale = mathutils.Matrix.Scale(self.bioxel_size, - 4) - - layer_transfrom = mat_lps2ras @ mat_location @ mat_rotation @ mat_scale \ - if meta['is_oriented'] else mat_location @ mat_rotation @ mat_scale - - def convert_to_vdb(volume, layer_shape, layer_type, progress_callback=None): - if self.as_time_sequence: - grids_sequence = [] - for f in range(volume.shape[0]): - if cancel(): - raise CancelledByUser - - print(f"Processing Frame {f+1}...") - if progress_callback: - progress_callback(f, volume.shape[0]) - frame = ski.resize(volume[f, :, :, :], - layer_shape, - preserve_range=True, - anti_aliasing=volume.dtype.kind != "b") - - grid = vdb.FloatGrid() - frame = frame.copy().astype(np.float32) - grid.copyFromArray(frame) - grid.transform = vdb.createLinearTransform( - layer_transfrom.transposed()) - grid.name = layer_type - grids_sequence.append([grid]) - - print(f"Saving the Cache...") - vdb_paths = save_vdbs(grids_sequence, context) - - else: - if cancel(): - raise CancelledByUser - print(f"Processing the Data...") - volume = ski.resize(volume, - layer_shape, - preserve_range=True, - anti_aliasing=volume.dtype.kind != "b") - - grid = vdb.FloatGrid() - volume = volume.copy().astype(np.float32) - grid.copyFromArray(volume) - grid.transform = vdb.createLinearTransform( - layer_transfrom.transposed()) - grid.name = layer_type - - print(f"Saving the Cache...") - vdb_paths = [save_vdb([grid], context)] - - return vdb_paths - - if cancel(): - return - - # change shape as sequence or not - if self.as_time_sequence: - if volume.shape[0] == 1: - # channel as frame - volume = volume.transpose(4, 1, 2, 3, 0) - - else: - volume = volume[0, :, :, :, :] - - layers = [] - - if self.read_as == "label": - layer_name = self.layer_name or "Label" - volume = np.amax(volume, -1) - volume = volume.astype(int) - orig_max = int(np.max(volume)) - orig_min = int(np.min(volume)) - progress_step = 0.7/orig_max - - for i in range(orig_max): - if cancel(): - return - - layer_name_i = f"{layer_name}_{i+1}" - progress = 0.2+i*progress_step - progress_update(context, progress, - f"Processing {layer_name_i}...") - - def progress_callback(frame, total): - sub_progress_step = progress_step/total - sub_progress = progress + frame * sub_progress_step - progress_update(context, sub_progress, - f"Processing {layer_name_i} Frame {frame+1}...") - - label = volume == np.full_like(volume, i+1) - try: - filepaths = convert_to_vdb(volume=label, - layer_shape=layer_shape, - layer_type="label", - progress_callback=progress_callback) - except CancelledByUser: - return - - layers.append({"name": layer_name_i, - "filepaths": filepaths, - "type": "label", - "shape": layer_shape, - "transfrom": layer_transfrom, - "dtype": layer_dtype, - "node_type": "BioxelNodes_MaskByLabel", - "scalar_offset": 0, - "orig_min": 0, - "orig_max": 1}) - - elif self.read_as == "scalar": - layer_name = self.layer_name or "Scalar" - # SHOULD NOT change any value! - volume = volume.astype(np.float32) - - if self.split_channels: - progress_step = 0.7/volume.shape[-1] - for i in range(volume.shape[-1]): - if cancel(): - return - - layer_name_i = f"{layer_name}_{i+1}" - progress = 0.2 + i*progress_step - - progress_update(context, progress, - f"Processing {layer_name_i}...") - - def progress_callback(frame, total): - sub_progress_step = progress_step/total - sub_progress = progress + frame * sub_progress_step - progress_update(context, sub_progress, - f"Processing {layer_name_i} Frame {frame+1}...") - - scalar = volume[:, :, :, :, i] \ - if self.as_time_sequence else volume[:, :, :, i] - orig_max = float(np.max(scalar)) - orig_min = float(np.min(scalar)) - - scalar_offset = 0 - if orig_min < 0: - scalar_offset = -orig_min - scalar = scalar + \ - np.full_like(scalar, scalar_offset) - try: - filepaths = convert_to_vdb(volume=scalar, - layer_shape=layer_shape, - layer_type="scalar", - progress_callback=progress_callback) - except CancelledByUser: - return - - layers.append({"name": layer_name_i, - "filepaths": filepaths, - "type": "scalar", - "shape": layer_shape, - "transfrom": layer_transfrom, - "dtype": layer_dtype, - "node_type": "BioxelNodes_MaskByThreshold", - "scalar_offset": scalar_offset, - "orig_min": orig_min, - "orig_max": orig_max}) - - else: - if cancel(): - return - - progress_update(context, 0.2, - f"Processing {layer_name}...") - volume = np.amax(volume, -1) - orig_max = float(np.max(volume)) - orig_min = float(np.min(volume)) - - scalar_offset = 0 - if orig_min < 0: - scalar_offset = -orig_min - volume = volume + np.full_like(volume, scalar_offset) - - def progress_callback(frame, total): - sub_progress_step = 0.7/total - sub_progress = 0.2 + frame * sub_progress_step - progress_update(context, sub_progress, - f"Processing {layer_name} Frame {frame+1}...") - - try: - filepaths = convert_to_vdb(volume=volume, - layer_shape=layer_shape, - layer_type="scalar", - progress_callback=progress_callback) - except CancelledByUser: - return - - layers.append({"name": layer_name, - "filepaths": filepaths, - "type": "scalar", - "shape": layer_shape, - "transfrom": layer_transfrom, - "dtype": layer_dtype, - "node_type": "BioxelNodes_MaskByThreshold", - "scalar_offset": scalar_offset, - "orig_min": orig_min, - "orig_max": orig_max}) - - if cancel(): - return - - self.layers = layers - self.is_first_import = len(get_all_layers()) == 0 - progress_update(context, 0.9, "Creating Layers...") - - self.is_cancelled = False - self.thread = threading.Thread(target=import_volumetric_data_func, - args=(self, context, lambda: self.is_cancelled)) - - self.thread.start() - self._timer = context.window_manager.event_timer_add(time_step=0.1, - window=context.window) - bpy.types.STATUSBAR_HT_header.append(progress_bar) - - context.window_manager.modal_handler_add(self) - return {'RUNNING_MODAL'} - - def modal(self, context, event): - if event.type == 'ESC': - self.is_cancelled = True - progress_update(context, 0, "Canceling...") - return {'PASS_THROUGH'} - - if event.type != 'TIMER': - return {'PASS_THROUGH'} - - bpy.context.workspace.status_text_set_internal(None) - if self.thread.is_alive(): - return {'PASS_THROUGH'} - - self.thread.join() - context.window_manager.event_timer_remove(self._timer) - bpy.types.STATUSBAR_HT_header.remove(progress_bar) - - if self.is_cancelled: - self.report({"WARNING"}, "Canncelled by user.") - return {'CANCELLED'} - - # Wrapper a Container - if not self.container: - container_name = self.container_name or "Container" - - # Make transformation - # (S)uperior -Z -> Y - # (A)osterior Y -> Z - mat_ras2blender = axis_conversion(from_forward='-Z', - from_up='Y', - to_forward='Y', - to_up='Z').to_4x4() - - mat_scene_scale = mathutils.Matrix.Scale(self.scene_scale, - 4) - - bpy.ops.mesh.primitive_cube_add(enter_editmode=False, - align='WORLD', - location=(0, 0, 0), - scale=(1, 1, 1)) - - container = bpy.context.active_object - - bbox_verts = calc_bbox_verts((0, 0, 0), self.layers[0]['shape']) - for i, vert in enumerate(container.data.vertices): - vert.co = self.layers[0]['transfrom'] @ mathutils.Vector( - bbox_verts[i]) - - container.matrix_world = mat_ras2blender @ mat_scene_scale - container.name = container_name - container.show_in_front = True - container.data.name = container_name - - container['bioxel_container'] = True - bpy.ops.node.new_geometry_nodes_modifier() - container_node_group = container.modifiers[0].node_group - input_node = get_nodes_by_type(container_node_group, - 'NodeGroupInput')[0] - container_node_group.links.remove( - input_node.outputs[0].links[0]) - - else: - container = bpy.data.objects[self.container] - container_node_group = container.modifiers[0].node_group - - for i, layer_info in enumerate(self.layers): - # Read VDB - print(f"Loading the Cache of {layer_info['name']}...") - filepaths = layer_info["filepaths"] - if len(filepaths) > 0: - # Read VDB - files = [{"name": str(filepath.name), "name": str(filepath.name)} - for filepath in filepaths] - - bpy.ops.object.volume_import(filepath=str(filepaths[0]), directory=str(filepaths[0].parent), - files=files, align='WORLD', location=(0, 0, 0), scale=(1, 1, 1)) - else: - bpy.ops.object.volume_import(filepath=str(filepaths[0]), - align='WORLD', location=(0, 0, 0), scale=(1, 1, 1)) - - layer = bpy.context.active_object - layer.data.sequence_mode = 'REPEAT' - - # Set props to VDB object - layer.name = f"{container.name}_{layer_info['name']}" - layer.data.name = f"{container.name}_{layer_info['name']}" - - lock_transform(layer) - hide_in_ray(layer) - layer.hide_select = True - layer.hide_render = True - layer.hide_viewport = True - # layer.data.display.use_slice = True - # layer.data.display.density = 1e-05 - - layer['bioxel_layer'] = True - layer['bioxel_layer_type'] = layer_info['type'] - layer.parent = container - - for collection in layer.users_collection: - collection.objects.unlink(layer) - - for collection in container.users_collection: - collection.objects.link(layer) - - print(f"Creating Node for {layer_info['name']}...") - - bpy.ops.node.new_geometry_nodes_modifier() - node_group = layer.modifiers[0].node_group - - input_node = get_nodes_by_type(node_group, 'NodeGroupInput')[0] - output_node = get_nodes_by_type( - node_group, 'NodeGroupOutput')[0] - - to_layer_node = custom_nodes.add_node(node_group, - "BioxelNodes__ConvertToLayer") - - node_group.links.new(input_node.outputs[0], - to_layer_node.inputs[0]) - node_group.links.new(to_layer_node.outputs[0], - output_node.inputs[0]) - - # TODO: change to transform when 4.2? - loc, rot, sca = layer_info['transfrom'].decompose() - layer_origin = tuple(loc) - layer_rotation = tuple(rot.to_euler()) - - # for compatibility to old vdb - # to_layer_node.inputs['Not Transfromed'].default_value = True - to_layer_node.inputs['Layer ID'].default_value = random.randint(-200000000, - 200000000) - to_layer_node.inputs['Bioxel Size'].default_value = self.bioxel_size - to_layer_node.inputs['Data Type'].default_value = layer_info['dtype'] - to_layer_node.inputs['Shape'].default_value = layer_info['shape'] - to_layer_node.inputs['Origin'].default_value = layer_origin - to_layer_node.inputs['Rotation'].default_value = layer_rotation - to_layer_node.inputs['Scalar Offset'].default_value = layer_info['scalar_offset'] - to_layer_node.inputs['Scalar Min'].default_value = layer_info['orig_min'] - to_layer_node.inputs['Scalar Max'].default_value = layer_info['orig_max'] - - move_node_between_nodes( - to_layer_node, [input_node, output_node]) - - mask_node = custom_nodes.add_node(container_node_group, - layer_info['node_type']) - mask_node.label = layer_info['name'] - mask_node.inputs[0].default_value = layer - - # Connect to output if no output linked - output_node = get_nodes_by_type(container_node_group, - 'NodeGroupOutput')[0] - if len(output_node.inputs[0].links) == 0: - container_node_group.links.new(mask_node.outputs[0], - output_node.inputs[0]) - move_node_to_node(mask_node, output_node, (-300, 0)) - else: - move_node_to_node(mask_node, output_node, (0, -100 * (i+1))) - - select_object(container) - - # Change render setting for better result - preferences = context.preferences.addons[__package__].preferences - if preferences.do_change_render_setting and self.is_first_import: - bpy.context.scene.render.engine = 'CYCLES' - try: - bpy.context.scene.cycles.shading_system = True - bpy.context.scene.cycles.volume_bounces = 12 - bpy.context.scene.cycles.transparent_max_bounces = 16 - bpy.context.scene.cycles.volume_preview_step_rate = 10 - bpy.context.scene.cycles.volume_step_rate = 10 - except: - pass - - try: - bpy.context.scene.eevee.use_taa_reprojection = False - bpy.context.scene.eevee.volumetric_tile_size = '2' - bpy.context.scene.eevee.volumetric_shadow_samples = 128 - bpy.context.scene.eevee.volumetric_samples = 256 - except: - pass - - if bpy.app.version >= (4, 2, 0): - try: - bpy.context.scene.eevee.use_volumetric_shadows = True - except: - pass - - self.report({"INFO"}, "Successfully Imported") - return {'FINISHED'} - - def invoke(self, context, event): - if self.read_as == "label": - volume_dtype = "Label" - elif self.read_as == "scalar": - volume_dtype = "Scalar" - title = f"As {volume_dtype} Opitons (Add to Container: {self.container})" \ - if self.container != "" else f"As {volume_dtype} Options (Init a Container)" - context.window_manager.invoke_props_dialog(self, - width=500, - title=title) - return {'RUNNING_MODAL'} - - def draw(self, context): - layer_shape = get_layer_shape(self.bioxel_size, - self.orig_shape, - self.orig_spacing) - - orig_shape = tuple(self.orig_shape) - - bioxel_count = layer_shape[0] * layer_shape[1] * layer_shape[2] - layer_shape_text = f"Shape from {str(orig_shape)} to {str(layer_shape)}" - if bioxel_count > 100000000: - layer_shape_text += "**TOO LARGE!**" - - layout = self.layout - if self.container == "": - layout.prop(self, "container_name") - layout.prop(self, "layer_name") - - panel = layout.box() - panel.prop(self, "bioxel_size") - row = panel.row() - row.prop(self, "orig_spacing") - panel.label(text=layer_shape_text) - - panel = layout.box() - if self.as_time_sequence and self.frame_count == 1: - channel_count = 1 - frame_count = self.channel_count - else: - channel_count = self.channel_count - frame_count = self.frame_count - - import_channel = channel_count if self.split_channels or channel_count == 1 else "combined" - import_frame = frame_count if self.as_time_sequence else "1" - panel.prop(self, "as_time_sequence", - text=f"As Time Sequence (get {frame_count} frames, import {import_frame} frames)") - if self.read_as == "scalar": - panel.prop(self, "split_channels", - text=f"Split Channels (get {channel_count} channels, import {import_channel} channels)") - - if self.container == "": - layer_size = get_layer_size(layer_shape, - self.bioxel_size, - self.scene_scale) - layer_size_text = f"Size will be: ({layer_size[0]:.2f}, {layer_size[1]:.2f}, {layer_size[2]:.2f}) m" - panel = layout.box() - panel.prop(self, "scene_scale") - panel.label(text=layer_size_text) - - -class ExportVolumetricData(bpy.types.Operator): - bl_idname = "bioxelnodes.export_volumetric_data" - bl_label = "Export Layer as VDB" - bl_description = "Export Layer as VDB" - bl_options = {'UNDO'} - - filepath: bpy.props.StringProperty( - subtype="FILE_PATH" - ) # type: ignore - - filename_ext = ".vdb" - - @classmethod - def poll(cls, context): - layer = get_layer(bpy.context.active_object) - return True if layer else False - - def invoke(self, context, event): - context.window_manager.fileselect_add(self) - return {'RUNNING_MODAL'} - - def execute(self, context): - layer = get_layer(bpy.context.active_object) - - filepath = f"{self.filepath.split('.')[0]}.vdb" - # "//" - source_dir = bpy.path.abspath(layer.data.filepath) - - output_path: Path = Path(filepath).resolve() - source_path: Path = Path(source_dir).resolve() - # print('output_path', output_path) - # print('source_path', source_path) - shutil.copy(source_path, output_path) - - self.report({"INFO"}, f"Successfully exported to {output_path}") - - return {'FINISHED'} diff --git a/bioxelnodes/io_points.py b/bioxelnodes/io_points.py deleted file mode 100644 index 0bd36f7..0000000 --- a/bioxelnodes/io_points.py +++ /dev/null @@ -1,25 +0,0 @@ -# TODO: WIP -import bpy -import bmesh - - -def create_points_obj(points, name="points"): - bpy.ops.mesh.primitive_cube_add( - enter_editmode=False, align='WORLD', location=(0, 0, 0), scale=(1, 1, 1) - ) - obj = bpy.context.active_object - mesh = obj.data - - bm = bmesh.new() - value_layer = bm.verts.layers.float.new('value') - - for point in points: - pos = point['pos'] - value = point['value'] - vert = bm.verts.new(pos) # add a new vert - vert[value_layer] = value - - # make the bmesh the object's mesh - bm.to_mesh(mesh) - bm.free() # always do this when finished - return obj \ No newline at end of file diff --git a/bioxelnodes/menus.py b/bioxelnodes/menus.py index 4f70efa..f289f9e 100644 --- a/bioxelnodes/menus.py +++ b/bioxelnodes/menus.py @@ -1,10 +1,21 @@ import bpy -from .utils import get_container_from_selection -from .operators import (AddPieCutter, AddPlaneCutter, AddCylinderCutter, AddCubeCutter, AddSphereCutter, CombineLabels, - ConvertToMesh, InvertScalar, FillByLabel, FillByThreshold, FillByRange, PickBboxWire, PickMesh, PickVolume) -from .io import ExportVolumetricData, ImportAsLabelLayer, ImportAsScalarLayer -from .save import CleanAllCaches, ReLinkNodes, SaveLayers, SaveStagedData +from .bioxelutils.container import get_container_objs_from_selection +from .operators.layer import (CombineLabels, SignScalar, + FillByLabel, FillByThreshold, FillByRange) +from .operators.container import (SaveContainer, LoadContainer, + AddPieCutter, AddPlaneCutter, + AddCylinderCutter, AddCubeCutter, AddSphereCutter, + PickBboxWire, PickMesh, PickVolume) +from .operators.io import (ExportVolumetricData, + ImportAsLabelLayer, ImportAsScalarLayer) +from .operators.misc import (CleanAllCaches, + ReLinkNodes, SaveCaches, SaveStagedData) + + +def container_is_selected(): + container_objs = get_container_objs_from_selection() + return len(container_objs) > 0 class PickFromContainerMenu(bpy.types.Menu): @@ -24,7 +35,7 @@ class ModifyLayerMenu(bpy.types.Menu): def draw(self, context): layout = self.layout - layout.operator(InvertScalar.bl_idname) + layout.operator(SignScalar.bl_idname) layout.operator(FillByThreshold.bl_idname) layout.operator(FillByRange.bl_idname) layout.operator(FillByLabel.bl_idname) @@ -60,8 +71,7 @@ class BioxelNodesView3DMenu(bpy.types.Menu): def draw(self, context): layout = self.layout - containers = get_container_from_selection() - is_selected = len(containers) > 0 + is_selected = container_is_selected() layout.operator(ImportAsScalarLayer.bl_idname, text=ImportAsScalarLayer.bl_label+" (Add to)" if is_selected else ImportAsScalarLayer.bl_label+" (Init)") @@ -79,7 +89,7 @@ def draw(self, context): layout.operator(PickVolume.bl_idname) layout.operator(PickBboxWire.bl_idname) layout.separator() - layout.operator(SaveLayers.bl_idname) + layout.operator(SaveCaches.bl_idname) class BioxelNodesOutlinerMenu(bpy.types.Menu): @@ -88,8 +98,7 @@ class BioxelNodesOutlinerMenu(bpy.types.Menu): def draw(self, context): layout = self.layout - containers = get_container_from_selection() - is_selected = len(containers) > 0 + is_selected = container_is_selected() layout.operator(ImportAsScalarLayer.bl_idname, text=ImportAsScalarLayer.bl_label+" (Add to)" if is_selected else ImportAsScalarLayer.bl_label+" (Init)") @@ -107,21 +116,18 @@ def draw(self, context): layout.operator(PickVolume.bl_idname) layout.operator(PickBboxWire.bl_idname) layout.separator() - layout.operator(SaveLayers.bl_idname) + layout.operator(SaveCaches.bl_idname) layout.separator() - layout.operator(InvertScalar.bl_idname) + layout.operator(SignScalar.bl_idname) layout.operator(FillByThreshold.bl_idname) layout.operator(FillByRange.bl_idname) layout.operator(FillByLabel.bl_idname) layout.operator(CombineLabels.bl_idname) - layout.separator() - layout.operator(ExportVolumetricData.bl_idname) def TOPBAR_FILE_IMPORT(self, context): layout = self.layout - containers = get_container_from_selection() - is_selected = len(containers) > 0 + is_selected = container_is_selected() layout.separator() layout.menu(ImportLayerMenu.bl_idname, text="Volumetric Data as Bioxel (Add to)" @@ -153,12 +159,14 @@ class BioxelNodesTopbarMenu(bpy.types.Menu): def draw(self, context): layout = self.layout - containers = get_container_from_selection() - is_selected = len(containers) > 0 + is_selected = container_is_selected() layout.menu(ImportLayerMenu.bl_idname, text=ImportLayerMenu.bl_label+" (Add to)" if is_selected else ImportLayerMenu.bl_label+" (Init)") layout.separator() + layout.operator(LoadContainer.bl_idname) + layout.operator(SaveContainer.bl_idname) + layout.separator() layout.menu(AddCutterMenu.bl_idname) layout.menu(PickFromContainerMenu.bl_idname) layout.separator() @@ -171,11 +179,11 @@ def draw(self, context): def TOPBAR(self, context): layout = self.layout layout.menu(BioxelNodesTopbarMenu.bl_idname) - - + + def add(): bpy.types.TOPBAR_MT_file_import.append(TOPBAR_FILE_IMPORT) - bpy.types.TOPBAR_MT_file_export.append(TOPBAR_FILE_EXPORT) + # bpy.types.TOPBAR_MT_file_export.append(TOPBAR_FILE_EXPORT) bpy.types.OUTLINER_MT_object.append(OUTLINER_OBJECT) bpy.types.VIEW3D_MT_object_context_menu.append(VIEW3D_OBJECT) bpy.types.TOPBAR_MT_editor_menus.append(TOPBAR) @@ -183,7 +191,7 @@ def add(): def remove(): bpy.types.TOPBAR_MT_file_import.remove(TOPBAR_FILE_IMPORT) - bpy.types.TOPBAR_MT_file_export.remove(TOPBAR_FILE_EXPORT) + # bpy.types.TOPBAR_MT_file_export.remove(TOPBAR_FILE_EXPORT) bpy.types.OUTLINER_MT_object.remove(OUTLINER_OBJECT) bpy.types.VIEW3D_MT_object_context_menu.remove(VIEW3D_OBJECT) bpy.types.TOPBAR_MT_editor_menus.remove(TOPBAR) diff --git a/bioxelnodes/nodes.py b/bioxelnodes/nodes.py index 55a6bcc..a63e06e 100644 --- a/bioxelnodes/nodes.py +++ b/bioxelnodes/nodes.py @@ -1,62 +1,8 @@ from pathlib import Path from .customnodes import CustomNodes -import bpy -# def set_object_to_node_factory(object_type:str): -# if object_type == "plane": -# create_object = """ -# bpy.ops.mesh.primitive_plane_add(size=2, enter_editmode=False, align='WORLD', location=(0, 0, 0), scale=(1, 1, 1)) -# """ -# callback_str = f""" -# import bpy -# from ..utils import get_container -# container = get_container(bpy.context.active_object) -# if container: -# {create_object} -# object = bpy.context.active_object -# node.inputs[0].default_value = object -# else: -# print('Cannot find any Bioxel Container.') -# """ -# return callback_str - - -# def add_driver_to_node_factory(source_prop, target_prop): -# callback_str = f""" -# import bpy -# from .utils import add_direct_driver, get_bioxels_obj -# bioxels_obj = get_bioxels_obj(bpy.context.active_object) -# if bioxels_obj: -# container_obj = bioxels_obj.parent -# add_direct_driver( -# target=node, -# target_prop='{target_prop}', -# source=container_obj, -# source_prop='{source_prop}' -# ) -# else: -# print('Cannot find any bioxels.') -# """ -# return callback_str - - -# def set_prop_to_node_factory(source_prop, target_prop): -# callback_str = f""" -# import bpy -# from .utils import get_bioxels_obj -# bioxels_obj = get_bioxels_obj(bpy.context.active_object) -# if bioxels_obj: -# container_obj = bioxels_obj.parent -# node.inputs.get('{target_prop}').default_value = container_obj.get( -# '{source_prop}') -# else: -# print('Cannot find any bioxels.') -# """ -# return callback_str - - -NODE_FILE = "BioxelNodes_4.1" +NODE_FILE = "BioxelNodes_4.2" MENU_ITEMS = [ { diff --git a/bioxelnodes/operators.py b/bioxelnodes/operators.py deleted file mode 100644 index e945458..0000000 --- a/bioxelnodes/operators.py +++ /dev/null @@ -1,929 +0,0 @@ -from pathlib import Path -import random -import bpy -import pyopenvdb as vdb -import numpy as np -import bmesh -from . import skimage as ski -from . import scipy -from .nodes import custom_nodes -from .utils import (get_container, get_container_from_selection, get_container_layers, - get_layer, get_nodes_by_type, hide_in_ray, lock_transform, move_node_between_nodes, move_node_to_node, save_vdb, select_object) - - -def get_layer_name(layer): - container = layer.parent - return layer.name.removeprefix(container.name).replace("_", "") - - -def get_grids(layer): - layer_dir = bpy.path.abspath(layer.data.filepath) - grids, base_metadata = vdb.readAll(layer_dir) - return grids - - -def set_volume(grids, index, volume): - grids[index].clear() - grids[index].copyFromArray(volume.copy().astype(np.float32)) - - -def get_volume(grids, index, shape): - volume = np.ndarray(shape, np.float32) - volume.fill(index) - grids[0].copyToArray(volume) - return volume - - -def get_shape(layer): - layer_node = layer.modifiers[0].node_group.nodes['BioxelNodes__ConvertToLayer'] - return [int(a) - for a in layer_node.inputs['Shape'].default_value] - - -def get_layer_meta(layer, key: str): - layer_node = layer.modifiers[0].node_group.nodes['BioxelNodes__ConvertToLayer'] - return layer_node.inputs[key].default_value - - -def set_layer_meta(layer, key: str, value): - layer_node = layer.modifiers[0].node_group.nodes['BioxelNodes__ConvertToLayer'] - layer_node.inputs[key].default_value = value - - -def add_mask_node(container, layer, node_type: str, node_label: str): - modifier = container.modifiers[0] - container_node_group = modifier.node_group - - mask_node = custom_nodes.add_node(container_node_group, node_type) - mask_node.label = node_label - mask_node.inputs[0].default_value = layer - - # Connect to output if no output linked - output_node = get_nodes_by_type(container_node_group, - 'NodeGroupOutput')[0] - - if len(output_node.inputs[0].links) == 0: - container_node_group.links.new(mask_node.outputs[0], - output_node.inputs[0]) - move_node_to_node(mask_node, output_node, (-300, 0)) - else: - move_node_to_node(mask_node, output_node, (0, -100)) - - return mask_node - - -def deep_copy_layer(vdb_path, base_layer, name): - # Read VDB - print(f"Loading the cache to Blender scene...") - bpy.ops.object.volume_import( - filepath=str(vdb_path), align='WORLD', location=(0, 0, 0), scale=(1, 1, 1)) - - copyed_layer = bpy.context.active_object - - # Set props to VDB object - copyed_layer.name = name - copyed_layer.data.name = name - - lock_transform(copyed_layer) - hide_in_ray(copyed_layer) - copyed_layer.hide_select = True - copyed_layer.hide_render = True - copyed_layer.hide_viewport = True - # copyed_layer.data.display.use_slice = True - # copyed_layer.data.display.density = 1e-05 - - copyed_layer['bioxel_layer'] = True - copyed_layer['bioxel_layer_type'] = base_layer['bioxel_layer_type'] - copyed_layer.parent = base_layer.parent - - for collection in copyed_layer.users_collection: - collection.objects.unlink(copyed_layer) - - for collection in base_layer.users_collection: - collection.objects.link(copyed_layer) - - # add convert to layer node - base_layer_node = base_layer.modifiers[0].node_group.nodes['BioxelNodes__ConvertToLayer'] - - not_transformed = base_layer_node.inputs['Not Transfromed'].default_value - dtype_index = base_layer_node.inputs['Data Type'].default_value - bioxel_size = base_layer_node.inputs['Bioxel Size'].default_value - layer_shape = base_layer_node.inputs['Shape'].default_value - layer_origin = base_layer_node.inputs['Origin'].default_value - layer_rotation = base_layer_node.inputs['Rotation'].default_value - scalar_offset = base_layer_node.inputs['Scalar Offset'].default_value - scalar_min = base_layer_node.inputs['Scalar Min'].default_value - scalar_max = base_layer_node.inputs['Scalar Max'].default_value - - bpy.ops.node.new_geometry_nodes_modifier() - node_group = copyed_layer.modifiers[0].node_group - - input_node = get_nodes_by_type(node_group, 'NodeGroupInput')[0] - output_node = get_nodes_by_type(node_group, 'NodeGroupOutput')[0] - - copyed_layer_node = custom_nodes.add_node(node_group, - "BioxelNodes__ConvertToLayer") - - node_group.links.new(input_node.outputs[0], copyed_layer_node.inputs[0]) - node_group.links.new(copyed_layer_node.outputs[0], output_node.inputs[0]) - - # for compatibility to old vdb - copyed_layer_node.inputs['Not Transfromed'].default_value = not_transformed - copyed_layer_node.inputs['Layer ID'].default_value = random.randint(-200000000, - 200000000) - copyed_layer_node.inputs['Data Type'].default_value = dtype_index - copyed_layer_node.inputs['Bioxel Size'].default_value = bioxel_size - copyed_layer_node.inputs['Shape'].default_value = layer_shape - copyed_layer_node.inputs['Origin'].default_value = layer_origin - copyed_layer_node.inputs['Rotation'].default_value = layer_rotation - copyed_layer_node.inputs['Scalar Offset'].default_value = scalar_offset - copyed_layer_node.inputs['Scalar Min'].default_value = scalar_min - copyed_layer_node.inputs['Scalar Max'].default_value = scalar_max - - return copyed_layer - - -def get_scalar_layer_selection(self, context): - items = [("None", "None", "")] - container = get_container(bpy.context.active_object) - for layer in get_container_layers(container): - if layer.get("bioxel_layer_type") == "scalar": - items.append(( - layer.name, - layer.name, - "" - )) - - return items - - -def get_label_layer_selection(self, context): - items = [("None", "None", "")] - container = get_container(bpy.context.active_object) - for layer in get_container_layers(container): - if layer.get("bioxel_layer_type") == "label": - items.append(( - layer.name, - layer.name, - "" - )) - - return items - - -# class JoinLayers(bpy.types.Operator): -# bl_idname = "bioxelnodes.join_layers" -# bl_label = "Join Bioxel Layers" -# bl_description = "Join Additional Bioxel Layers" -# bl_options = {'UNDO'} - -# base_layer: bpy.props.StringProperty( -# options={"HIDDEN"} -# ) # type: ignore - -# scalar_layer: bpy.props.EnumProperty( -# name="Scalar Layer", -# items=get_scalar_layer_selection -# ) # type: ignore - -# label_layer: bpy.props.EnumProperty( -# name="Label Layer", -# items=get_label_layer_selection -# ) # type: ignore -# # color_layer: bpy.props.StringProperty() # type: ignore - -# @classmethod -# def poll(cls, context): -# layer = get_layer(bpy.context.active_object) -# return True if layer else False - -# def execute(self, context): -# base_layer = bpy.data.objects[self.base_layer] - -# if not base_layer: -# self.report({"WARNING"}, "Cannot find any bioxel layer as base.") -# return {'FINISHED'} - -# base_layer_dir = bpy.path.abspath(base_layer.data.filepath) -# base_grids, base_metadata = vdb.readAll(base_layer_dir) - -# layers = [] -# if self.scalar_layer != "None": -# scalar_layer = bpy.data.objects[self.scalar_layer] -# layers.append(scalar_layer) - -# if self.label_layer != "None": -# label_layer = bpy.data.objects[self.label_layer] -# layers.append(label_layer) - -# # TODO: add color and vector - -# if len(layers) == 0: -# self.report({"WARNING"}, "No additinal layers setted.") -# return {'FINISHED'} - -# for layer in layers: -# layer_dir = bpy.path.abspath(layer.data.filepath) -# grids, metadata = vdb.readAll(layer_dir) -# base_grids.extend(grids) - -# vdb_path = save_vdb(base_grids, context) - -# joined_layer = deep_copy_layer(vdb_path, -# base_layer, -# f"{base_layer.name}_Joined") - -# return {'FINISHED'} - -# def invoke(self, context, event): -# base_layer = get_layer(bpy.context.active_object) -# self.base_layer = base_layer.name -# context.window_manager.invoke_props_dialog(self, width=400) -# return {'RUNNING_MODAL'} - - -class InvertScalar(bpy.types.Operator): - bl_idname = "bioxelnodes.invert_scalar" - bl_label = "Invert Scalar" - bl_description = "Invert the scalar value" - bl_options = {'UNDO'} - - @classmethod - def poll(cls, context): - layer = get_layer(bpy.context.active_object) - if layer: - return layer.get("bioxel_layer_type") == "scalar" - else: - return False - - def execute(self, context): - base_layer = get_layer(bpy.context.active_object) - - container = base_layer.parent - inverted_layer_name = f"{get_layer_name(base_layer)}_Inverted" - - base_shape = get_shape(base_layer) - scalar_offset = get_layer_meta(base_layer, "Scalar Offset") - - base_grids = get_grids(base_layer) - base_volume = get_volume(base_grids, 0, base_shape) - - base_volume = -(base_volume - scalar_offset) - - base_min = float(np.min(base_volume)) - base_max = float(np.max(base_volume)) - - scalar_offset = 0 - if base_min < 0: - scalar_offset = -base_min - base_volume = base_volume + scalar_offset - - set_volume(base_grids, 0, base_volume) - vdb_path = save_vdb(base_grids, context) - inverted_layer = deep_copy_layer(vdb_path, - base_layer, - f"{container.name}_{inverted_layer_name}") - set_layer_meta(inverted_layer, 'Scalar Offset', scalar_offset) - set_layer_meta(inverted_layer, 'Scalar Min', base_min) - set_layer_meta(inverted_layer, 'Scalar Max', base_max) - - add_mask_node(container, - inverted_layer, - "BioxelNodes_MaskByThreshold", - inverted_layer_name) - - select_object(container) - - return {'FINISHED'} - - -class FillByThreshold(bpy.types.Operator): - bl_idname = "bioxelnodes.fill_by_threshold" - bl_label = "Fill Value by Threshold" - bl_description = "Fill Value by Threshold" - bl_options = {'UNDO'} - - threshold: bpy.props.FloatProperty( - name="Threshold", - soft_min=0, soft_max=1024, - default=128, - ) # type: ignore - - fill_value: bpy.props.FloatProperty( - name="Fill Value", - soft_min=0, soft_max=1024.0, - default=0, - ) # type: ignore - - invert: bpy.props.BoolProperty( - name="Invert Area", - default=True, - ) # type: ignore - - @classmethod - def poll(cls, context): - layer = get_layer(bpy.context.active_object) - if layer: - return layer.get("bioxel_layer_type") == "scalar" - else: - return False - - def execute(self, context): - base_layer = get_layer(bpy.context.active_object) - - container = base_layer.parent - filled_layer_name = f"{get_layer_name(base_layer)}_{self.threshold}-Filled" - scalar_offset = get_layer_meta(base_layer, "Scalar Offset") - base_shape = get_shape(base_layer) - - base_grids = get_grids(base_layer) - base_volume = get_volume(base_grids, 0, base_shape) - mask = base_volume > (self.threshold + scalar_offset) - mask = scipy.median_filter(mask.astype(np.float32), size=2) - if self.invert: - base_volume = mask * base_volume + \ - (1-mask) * (self.fill_value + scalar_offset) - else: - base_volume = (1-mask) * base_volume + \ - mask * (self.fill_value + scalar_offset) - - set_volume(base_grids, 0, base_volume) - vdb_path = save_vdb(base_grids, context) - filled_layer = deep_copy_layer(vdb_path, - base_layer, - f"{container.name}_{filled_layer_name}") - mask_node = add_mask_node(container, - filled_layer, - "BioxelNodes_MaskByThreshold", - filled_layer_name) - - mask_node.inputs[1].default_value = self.threshold - - select_object(container) - - return {'FINISHED'} - - def invoke(self, context, event): - base_layer = get_layer(bpy.context.active_object) - scalar_min = get_layer_meta(base_layer, "Scalar Min") - self.fill_value = min(scalar_min,0) - context.window_manager.invoke_props_dialog(self, width=400) - return {'RUNNING_MODAL'} - - -class FillByRange(bpy.types.Operator): - bl_idname = "bioxelnodes.fill_by_range" - bl_label = "Fill Value by Range" - bl_description = "Fill Value by Range" - bl_options = {'UNDO'} - - from_min: bpy.props.FloatProperty( - name="From Min", - soft_min=0, soft_max=1024, - default=128, - ) # type: ignore - - from_max: bpy.props.FloatProperty( - name="From Max", - soft_min=0, soft_max=1024, - default=256, - ) # type: ignore - - fill_value: bpy.props.FloatProperty( - name="Fill Value", - soft_min=0, soft_max=1024.0, - default=0, - ) # type: ignore - - invert: bpy.props.BoolProperty( - name="Invert Area", - default=True, - ) # type: ignore - - @classmethod - def poll(cls, context): - layer = get_layer(bpy.context.active_object) - if layer: - return layer.get("bioxel_layer_type") == "scalar" - else: - return False - - def execute(self, context): - base_layer = get_layer(bpy.context.active_object) - - container = base_layer.parent - filled_layer_name = f"{get_layer_name(base_layer)}_{self.from_min}-{self.from_max}-Filled" - scalar_offset = get_layer_meta(base_layer, "Scalar Offset") - base_shape = get_shape(base_layer) - - base_grids = get_grids(base_layer) - base_volume = get_volume(base_grids, 0, base_shape) - - mask = (base_volume > self.from_min + scalar_offset) \ - & (base_volume < self.from_max + scalar_offset) - mask = scipy.median_filter(mask.astype(np.float32), size=2) - - if self.invert: - base_volume = mask * base_volume + \ - (1-mask) * (self.fill_value + scalar_offset) - else: - base_volume = (1-mask) * base_volume + \ - mask * (self.fill_value + scalar_offset) - - set_volume(base_grids, 0, base_volume) - vdb_path = save_vdb(base_grids, context) - filled_layer = deep_copy_layer(vdb_path, - base_layer, - f"{container.name}_{filled_layer_name}") - mask_node = add_mask_node(container, - filled_layer, - "BioxelNodes_MaskByThreshold", - filled_layer_name) - - mask_node.inputs[1].default_value = self.from_min - - select_object(container) - - return {'FINISHED'} - - def invoke(self, context, event): - base_layer = get_layer(bpy.context.active_object) - scalar_min = get_layer_meta(base_layer, "Scalar Min") - self.fill_value = min(scalar_min,0) - context.window_manager.invoke_props_dialog(self, width=400) - return {'RUNNING_MODAL'} - - -class FillByLabel(bpy.types.Operator): - bl_idname = "bioxelnodes.fill_by_label" - bl_label = "Fill Value by Label" - bl_description = "Fill Value by Label Area" - bl_options = {'UNDO'} - - label_layer: bpy.props.EnumProperty( - name="Label Layer", - items=get_label_layer_selection - ) # type: ignore - - fill_value: bpy.props.FloatProperty( - name="Fill Value", - soft_min=0, soft_max=1024.0, - default=0, - ) # type: ignore - - invert: bpy.props.BoolProperty( - name="Invert Label", - default=True, - ) # type: ignore - - @classmethod - def poll(cls, context): - layer = get_layer(bpy.context.active_object) - if layer: - return layer.get("bioxel_layer_type") == "scalar" - else: - return False - - def execute(self, context): - base_layer = get_layer(bpy.context.active_object) - label_layer = bpy.data.objects[self.label_layer] - - if not label_layer: - self.report({"WARNING"}, "Cannot find any label layer.") - return {'FINISHED'} - - container = base_layer.parent - filled_layer_name = f"{get_layer_name(base_layer)}_{get_layer_name(label_layer)}-Filled" - scalar_offset = get_layer_meta(base_layer, "Scalar Offset") - base_shape = get_shape(base_layer) - label_shape = get_shape(label_layer) - - base_grids = get_grids(base_layer) - base_volume = get_volume(base_grids, 0, base_shape) - - label_grids = get_grids(label_layer) - mask = get_volume(label_grids, 0, label_shape) - mask = ski.resize(mask, - base_shape, - preserve_range=True, - anti_aliasing=True) - mask = scipy.median_filter(mask.astype(np.float32), size=2) - - if self.invert: - base_volume = mask * base_volume + \ - (1-mask) * (self.fill_value + scalar_offset) - else: - base_volume = (1-mask) * base_volume + \ - mask * (self.fill_value + scalar_offset) - - set_volume(base_grids, 0, base_volume) - vdb_path = save_vdb(base_grids, context) - filled_layer = deep_copy_layer(vdb_path, - base_layer, - f"{container.name}_{filled_layer_name}") - add_mask_node(container, - filled_layer, - "BioxelNodes_MaskByThreshold", - filled_layer_name) - - select_object(container) - - return {'FINISHED'} - - def invoke(self, context, event): - base_layer = get_layer(bpy.context.active_object) - scalar_min = get_layer_meta(base_layer, "Scalar Min") - self.fill_value = min(scalar_min,0) - context.window_manager.invoke_props_dialog(self, width=400) - return {'RUNNING_MODAL'} - - -class CombineLabels(bpy.types.Operator): - bl_idname = "bioxelnodes.combine_labels" - bl_label = "Combine Labels" - bl_description = "Combine all selected labels" - bl_options = {'UNDO'} - - @classmethod - def poll(cls, context): - labels = [obj for obj in context.selected_ids - if obj.get("bioxel_layer_type") == "label"] - return True if len(labels) > 1 else False - - def execute(self, context): - labels = [obj for obj in context.selected_ids - if obj.get("bioxel_layer_type") == "label"] - base_layer = labels[0] - labels = labels[1:] - container = base_layer.parent - label_names = [get_layer_name(base_layer)] - base_shape = get_shape(base_layer) - - base_grids = get_grids(base_layer) - base_volume = get_volume(base_grids, 0, base_shape) - base_volume = base_volume - - for label in labels: - label_shape = get_shape(label) - label_grids = get_grids(label) - label_volume = get_volume(label_grids, 0, label_shape) - label_volume = ski.resize(label_volume, - base_shape, - preserve_range=True, - anti_aliasing=True) - base_volume = np.maximum(base_volume, label_volume) - label_names.append(get_layer_name(label)) - - set_volume(base_grids, 0, base_volume) - - combined_layer_name = f"{'-'.join(label_names)}-Combined" - vdb_path = save_vdb(base_grids, context) - combined_layer = deep_copy_layer(vdb_path, - base_layer, - f"{container.name}_{combined_layer_name}") - add_mask_node(container, - combined_layer, - "BioxelNodes_MaskByLabel", - combined_layer_name) - - select_object(container) - return {'FINISHED'} - - -class ConvertToMesh(bpy.types.Operator): - bl_idname = "bioxelnodes.convert_to_mesh" - bl_label = "Convert To Mesh" - bl_description = "Convert Container To Mesh" - bl_options = {'UNDO'} - - @classmethod - def poll(cls, context): - containers = get_container_from_selection() - return len(containers) > 0 - - def execute(self, context): - containers = get_container_from_selection() - - if len(containers) == 0: - self.report({"WARNING"}, "Cannot find any bioxel container.") - return {'FINISHED'} - - container = containers[0] - - bpy.ops.mesh.primitive_cube_add( - size=2, enter_editmode=False, align='WORLD', location=(0, 0, 0), scale=(1, 1, 1)) - mesh = bpy.context.active_object - - mesh.name = f"Mesh_{container.name}" - - # bpy.ops.object.constraint_add(type='COPY_TRANSFORMS') - # mesh.constraints[0].target = container - - bpy.ops.node.new_geometry_nodes_modifier() - modifier = mesh.modifiers[0] - node_group = modifier.node_group - - output_node = get_nodes_by_type(node_group, 'NodeGroupOutput')[0] - to_mesh_node = custom_nodes.add_node(node_group, - "BioxelNodes_PickMesh") - - to_mesh_node.inputs[0].default_value = container - node_group.links.new(to_mesh_node.outputs[0], output_node.inputs[0]) - - # bpy.ops.constraint.apply( - # constraint=mesh.constraints[0].name, owner='OBJECT') - bpy.ops.object.modifier_apply(modifier=mesh.modifiers[0].name) - - select_object(mesh) - - self.report({"INFO"}, f"Successfully convert to mesh") - - return {'FINISHED'} - - -class PickMesh(bpy.types.Operator): - bl_idname = "bioxelnodes.pick_mesh" - bl_label = "Pick Mesh" - bl_description = "Pick Container Mesh" - bl_options = {'UNDO'} - - @classmethod - def poll(cls, context): - containers = get_container_from_selection() - return len(containers) > 0 - - def execute(self, context): - containers = get_container_from_selection() - - if len(containers) == 0: - self.report({"WARNING"}, "Cannot find any bioxel container.") - return {'FINISHED'} - - container = containers[0] - - bpy.ops.mesh.primitive_cube_add( - size=2, enter_editmode=False, align='WORLD', location=(0, 0, 0), scale=(1, 1, 1)) - mesh = bpy.context.active_object - - mesh.name = f"Mesh_{container.name}" - - bpy.ops.node.new_geometry_nodes_modifier() - modifier = mesh.modifiers[0] - node_group = modifier.node_group - - output_node = get_nodes_by_type(node_group, 'NodeGroupOutput')[0] - pick_mesh_node = custom_nodes.add_node(node_group, - "BioxelNodes_PickMesh") - - pick_mesh_node.inputs[0].default_value = container - node_group.links.new(pick_mesh_node.outputs[0], output_node.inputs[0]) - - select_object(mesh) - - self.report({"INFO"}, f"Successfully picked mesh") - - return {'FINISHED'} - - -class PickVolume(bpy.types.Operator): - bl_idname = "bioxelnodes.pick_volume" - bl_label = "Pick Volume" - bl_description = "Pick Container Volume" - bl_options = {'UNDO'} - - @classmethod - def poll(cls, context): - containers = get_container_from_selection() - return len(containers) > 0 - - def execute(self, context): - containers = get_container_from_selection() - - if len(containers) == 0: - self.report({"WARNING"}, "Cannot find any bioxel container.") - return {'FINISHED'} - - container = containers[0] - - bpy.ops.mesh.primitive_cube_add( - size=2, enter_editmode=False, align='WORLD', location=(0, 0, 0), scale=(1, 1, 1)) - volume = bpy.context.active_object - - volume.name = f"Volume_{container.name}" - - bpy.ops.node.new_geometry_nodes_modifier() - modifier = volume.modifiers[0] - node_group = modifier.node_group - - output_node = get_nodes_by_type(node_group, 'NodeGroupOutput')[0] - pick_volume_node = custom_nodes.add_node(node_group, - "BioxelNodes_PickVolume") - - pick_volume_node.inputs[0].default_value = container - node_group.links.new( - pick_volume_node.outputs[0], output_node.inputs[0]) - - select_object(volume) - - self.report({"INFO"}, f"Successfully picked volume") - - return {'FINISHED'} - - -class PickBboxWire(bpy.types.Operator): - bl_idname = "bioxelnodes.pick_bbox_wire" - bl_label = "Pick Bbox Wire" - bl_description = "Pick Container Bbox Wire" - bl_options = {'UNDO'} - - @classmethod - def poll(cls, context): - containers = get_container_from_selection() - return len(containers) > 0 - - def execute(self, context): - containers = get_container_from_selection() - - if len(containers) == 0: - self.report({"WARNING"}, "Cannot find any bioxel container.") - return {'FINISHED'} - - container = containers[0] - - bpy.ops.mesh.primitive_cube_add( - size=2, enter_editmode=False, align='WORLD', location=(0, 0, 0), scale=(1, 1, 1)) - bbox_wire = bpy.context.active_object - - bbox_wire.name = f"Wire_{container.name}" - - bpy.ops.node.new_geometry_nodes_modifier() - modifier = bbox_wire.modifiers[0] - node_group = modifier.node_group - - output_node = get_nodes_by_type(node_group, 'NodeGroupOutput')[0] - pick_bbox_wire_node = custom_nodes.add_node(node_group, - "BioxelNodes_PickBboxWire") - - pick_bbox_wire_node.inputs[0].default_value = container - node_group.links.new( - pick_bbox_wire_node.outputs[0], output_node.inputs[0]) - - select_object(bbox_wire) - - self.report({"INFO"}, f"Successfully picked bbox wire") - - return {'FINISHED'} - - -class AddCutter(): - bl_options = {'UNDO'} - - @classmethod - def poll(cls, context): - containers = get_container_from_selection() - return len(containers) > 0 - - def execute(self, context): - containers = get_container_from_selection() - - if len(containers) == 0: - self.report({"WARNING"}, "Cannot find any bioxel container.") - return {'FINISHED'} - - container = containers[0] - - if self.object_type == "plane": - node_type = "BioxelNodes_PlaneObjectCutter" - bpy.ops.mesh.primitive_plane_add( - size=2, enter_editmode=False, align='WORLD', location=(0, 0, 0), scale=(1, 1, 1)) - elif self.object_type == "cylinder": - node_type = "BioxelNodes_CylinderObjectCutter" - bpy.ops.mesh.primitive_cylinder_add( - radius=1, depth=2, enter_editmode=False, align='WORLD', location=(0, 0, 0), scale=(1, 1, 1)) - bpy.context.object.rotation_euler[0] = container.rotation_euler[0] - elif self.object_type == "cube": - node_type = "BioxelNodes_CubeObjectCutter" - bpy.ops.mesh.primitive_cube_add( - size=2, enter_editmode=False, align='WORLD', location=(0, 0, 0), scale=(1, 1, 1)) - elif self.object_type == "sphere": - node_type = "BioxelNodes_SphereObjectCutter" - bpy.ops.mesh.primitive_ico_sphere_add( - radius=1, enter_editmode=False, align='WORLD', location=(0, 0, 0), scale=(1, 1, 1)) - elif self.object_type == "pie": - node_type = "BioxelNodes_PieObjectCutter" - # Create mesh - pie_mesh = bpy.data.meshes.new('Pie') - - # Create object - pie = bpy.data.objects.new('Pie', pie_mesh) - - # Link object to scene - bpy.context.scene.collection.objects.link(pie) - # Get a BMesh representation - bm = bmesh.new() # create an empty BMesh - bm.from_mesh(pie_mesh) # fill it in from a Mesh - - # Hot to create vertices - v_0 = bm.verts.new((0.0, -1.0, 0.0)) - v_1 = bm.verts.new((-1.0, -1.0, 1.0)) - v_2 = bm.verts.new((0.0, 1.0, 0.0)) - v_3 = bm.verts.new((-1.0, 1.0, 1.0)) - v_4 = bm.verts.new((1.0, -1.0, 1.0)) - v_5 = bm.verts.new((1.0, 1.0, 1.0)) - - # Initialize the index values of this sequence. - bm.verts.index_update() - - # How to create a face - # it's not necessary to create the edges before, I made it only to show how create - # edges too - bm.faces.new((v_0, v_1, v_3, v_2)) - bm.faces.new((v_0, v_2, v_5, v_4)) - - # Finish up, write the bmesh back to the mesh - bm.to_mesh(pie_mesh) - bpy.context.view_layer.objects.active = pie - - cutter = bpy.context.active_object - cutter.visible_camera = False - cutter.visible_diffuse = False - cutter.visible_glossy = False - cutter.visible_transmission = False - cutter.visible_volume_scatter = False - cutter.visible_shadow = False - cutter.hide_render = True - cutter.display_type = 'WIRE' - - modifier = container.modifiers[0] - node_group = modifier.node_group - cutter_node = custom_nodes.add_node(node_group, node_type) - cutter_node.inputs[0].default_value = cutter - - cut_nodes = get_nodes_by_type(node_group, - 'BioxelNodes_Cut') - output_node = get_nodes_by_type(node_group, 'NodeGroupOutput')[0] - if len(cut_nodes) == 0: - cut_node = custom_nodes.add_node(node_group, 'BioxelNodes_Cut') - if len(output_node.inputs[0].links) == 0: - node_group.links.new(cut_node.outputs[0], - output_node.inputs[0]) - move_node_to_node(cut_node, output_node, (-300, 0)) - else: - pre_output_node = output_node.inputs[0].links[0].from_node - node_group.links.new(pre_output_node.outputs[0], - cut_node.inputs[0]) - node_group.links.new(cut_node.outputs[0], - output_node.inputs[0]) - move_node_between_nodes(cut_node, - [pre_output_node, output_node]) - - node_group.links.new(cutter_node.outputs[0], - cut_node.inputs[1]) - - move_node_to_node(cutter_node, cut_node, (-300, -300)) - select_object(cutter) - else: - move_node_to_node(cutter_node, output_node, (0, -100)) - select_object(container) - - return {'FINISHED'} - - -class AddPlaneCutter(bpy.types.Operator, AddCutter): - bl_idname = "bioxelnodes.add_plane_cutter" - bl_label = "Add a Plane Cutter" - bl_description = "Add a Plane Cutter to Container" - bl_options = {'UNDO'} - object_type = "plane" - - -class AddCylinderCutter(bpy.types.Operator, AddCutter): - bl_idname = "bioxelnodes.add_cylinder_cutter" - bl_label = "Add a Cylinder Cutter" - bl_description = "Add a Cylinder Cutter to Container" - bl_options = {'UNDO'} - object_type = "cylinder" - - -class AddCubeCutter(bpy.types.Operator, AddCutter): - bl_idname = "bioxelnodes.add_cube_cutter" - bl_label = "Add a Cube Cutter" - bl_description = "Add a Cube Cutter to Container" - bl_options = {'UNDO'} - object_type = "cube" - - -class AddSphereCutter(bpy.types.Operator, AddCutter): - bl_idname = "bioxelnodes.add_sphere_cutter" - bl_label = "Add a Sphere Cutter" - bl_description = "Add a Sphere Cutter to Container" - bl_options = {'UNDO'} - object_type = "sphere" - - -class AddPieCutter(bpy.types.Operator, AddCutter): - bl_idname = "bioxelnodes.add_pie_cutter" - bl_label = "Add a Pie Cutter" - bl_description = "Add a Pie Cutter to Container" - bl_options = {'UNDO'} - object_type = "pie" diff --git a/bioxelnodes/operators/__init__.py b/bioxelnodes/operators/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/bioxelnodes/operators/container.py b/bioxelnodes/operators/container.py new file mode 100644 index 0000000..34c45bf --- /dev/null +++ b/bioxelnodes/operators/container.py @@ -0,0 +1,283 @@ +import bpy + +import bmesh + +from ..nodes import custom_nodes +from ..bioxel.io import load_container, save_container +from ..bioxelutils.container import (container_to_obj, obj_to_container, + get_container_objs_from_selection) +from ..bioxelutils.node import get_nodes_by_type, move_node_between_nodes, move_node_to_node +from .utils import get_cache_dir, select_object + + +class SaveContainer(bpy.types.Operator): + bl_idname = "bioxelnodes.save_container" + bl_label = "Save Container (.bioxel) (BETA)" + bl_description = "Clean all caches saved in temp" + + filepath: bpy.props.StringProperty( + subtype="FILE_PATH" + ) # type: ignore + + filename_ext = ".bioxel" + + @classmethod + def poll(cls, context): + container_objs = get_container_objs_from_selection() + return len(container_objs) > 0 + + def execute(self, context): + container_objs = get_container_objs_from_selection() + + if len(container_objs) == 0: + self.report({"WARNING"}, "Cannot find any bioxel container.") + return {'FINISHED'} + + container = obj_to_container(container_objs[0]) + save_path = f"{self.filepath.split('.')[0]}.bioxel" + save_container(container, save_path, overwrite=True) + + self.report({"INFO"}, f"Successfully save to {save_path}") + return {'FINISHED'} + + def invoke(self, context, event): + context.window_manager.fileselect_add(self) + return {'RUNNING_MODAL'} + + +class LoadContainer(bpy.types.Operator): + bl_idname = "bioxelnodes.load_container" + bl_label = "Load Container (.bioxel) (BETA)" + bl_description = "Clean all caches saved in temp" + + filepath: bpy.props.StringProperty( + subtype="FILE_PATH" + ) # type: ignore + + filename_ext = ".bioxel" + + def execute(self, context): + load_path = self.filepath + container = load_container(self.filepath) + container_obj = container_to_obj(container, + scene_scale=0.01, + cache_dir=get_cache_dir(context)) + select_object(container_obj) + + self.report({"INFO"}, f"Successfully load {load_path}") + return {'FINISHED'} + + def invoke(self, context, event): + context.window_manager.fileselect_add(self) + return {'RUNNING_MODAL'} + + +class PickObject(): + bl_options = {'UNDO'} + + @classmethod + def poll(cls, context): + container_objs = get_container_objs_from_selection() + return len(container_objs) > 0 + + def execute(self, context): + container_objs = get_container_objs_from_selection() + + if len(container_objs) == 0: + self.report({"WARNING"}, "Cannot find any bioxel container.") + return {'FINISHED'} + + container_obj = container_objs[0] + + bpy.ops.mesh.primitive_cube_add( + size=2, enter_editmode=False, align='WORLD', location=(0, 0, 0), scale=(1, 1, 1)) + obj = bpy.context.active_object + + obj.name = f"{self.object_type}_{container_obj.name}" + + bpy.ops.node.new_geometry_nodes_modifier() + modifier = obj.modifiers[0] + node_group = modifier.node_group + + output_node = get_nodes_by_type(node_group, 'NodeGroupOutput')[0] + pick_mesh_node = custom_nodes.add_node(node_group, + f"BioxelNodes_Pick{self.object_type}") + + pick_mesh_node.inputs[0].default_value = container_obj + node_group.links.new(pick_mesh_node.outputs[0], output_node.inputs[0]) + + select_object(obj) + + self.report({"INFO"}, f"Successfully picked") + + return {'FINISHED'} + + +class PickMesh(bpy.types.Operator, PickObject): + bl_idname = "bioxelnodes.pick_mesh" + bl_label = "Pick Mesh" + bl_description = "Pick Container Mesh" + object_type = "Mesh" + + +class PickVolume(bpy.types.Operator, PickObject): + bl_idname = "bioxelnodes.pick_volume" + bl_label = "Pick Volume" + bl_description = "Pick Container Volume" + object_type = "Volume" + + +class PickBboxWire(bpy.types.Operator, PickObject): + bl_idname = "bioxelnodes.pick_bbox_wire" + bl_label = "Pick Bbox Wire" + bl_description = "Pick Container Bbox Wire" + object_type = "BboxWire" + + +class AddCutter(): + bl_options = {'UNDO'} + + @classmethod + def poll(cls, context): + container_objs = get_container_objs_from_selection() + return len(container_objs) > 0 + + def execute(self, context): + container_objs = get_container_objs_from_selection() + + if len(container_objs) == 0: + self.report({"WARNING"}, "Cannot find any bioxel container.") + return {'FINISHED'} + + container_obj = container_objs[0] + + if self.object_type == "plane": + node_type = "BioxelNodes_PlaneObjectCutter" + bpy.ops.mesh.primitive_plane_add( + size=2, enter_editmode=False, align='WORLD', location=(0, 0, 0), scale=(1, 1, 1)) + elif self.object_type == "cylinder": + node_type = "BioxelNodes_CylinderObjectCutter" + bpy.ops.mesh.primitive_cylinder_add( + radius=1, depth=2, enter_editmode=False, align='WORLD', location=(0, 0, 0), scale=(1, 1, 1)) + bpy.context.object.rotation_euler[0] = container_obj.rotation_euler[0] + elif self.object_type == "cube": + node_type = "BioxelNodes_CubeObjectCutter" + bpy.ops.mesh.primitive_cube_add( + size=2, enter_editmode=False, align='WORLD', location=(0, 0, 0), scale=(1, 1, 1)) + elif self.object_type == "sphere": + node_type = "BioxelNodes_SphereObjectCutter" + bpy.ops.mesh.primitive_ico_sphere_add( + radius=1, enter_editmode=False, align='WORLD', location=(0, 0, 0), scale=(1, 1, 1)) + elif self.object_type == "pie": + node_type = "BioxelNodes_PieObjectCutter" + # Create mesh + pie_mesh = bpy.data.meshes.new('Pie') + + # Create object + pie = bpy.data.objects.new('Pie', pie_mesh) + + # Link object to scene + bpy.context.scene.collection.objects.link(pie) + # Get a BMesh representation + bm = bmesh.new() # create an empty BMesh + bm.from_mesh(pie_mesh) # fill it in from a Mesh + + # Hot to create vertices + v_0 = bm.verts.new((0.0, -1.0, 0.0)) + v_1 = bm.verts.new((-1.0, -1.0, 1.0)) + v_2 = bm.verts.new((0.0, 1.0, 0.0)) + v_3 = bm.verts.new((-1.0, 1.0, 1.0)) + v_4 = bm.verts.new((1.0, -1.0, 1.0)) + v_5 = bm.verts.new((1.0, 1.0, 1.0)) + + # Initialize the index values of this sequence. + bm.verts.index_update() + + # How to create a face + # it's not necessary to create the edges before, I made it only to show how create + # edges too + bm.faces.new((v_0, v_1, v_3, v_2)) + bm.faces.new((v_0, v_2, v_5, v_4)) + + # Finish up, write the bmesh back to the mesh + bm.to_mesh(pie_mesh) + bpy.context.view_layer.objects.active = pie + + cutter_obj = bpy.context.active_object + cutter_obj.visible_camera = False + cutter_obj.visible_diffuse = False + cutter_obj.visible_glossy = False + cutter_obj.visible_transmission = False + cutter_obj.visible_volume_scatter = False + cutter_obj.visible_shadow = False + cutter_obj.hide_render = True + cutter_obj.display_type = 'WIRE' + + modifier = container_obj.modifiers[0] + node_group = modifier.node_group + cutter_node = custom_nodes.add_node(node_group, node_type) + cutter_node.inputs[0].default_value = cutter_obj + + cut_nodes = get_nodes_by_type(node_group, + 'BioxelNodes_Cut') + output_node = get_nodes_by_type(node_group, 'NodeGroupOutput')[0] + if len(cut_nodes) == 0: + cut_node = custom_nodes.add_node(node_group, 'BioxelNodes_Cut') + if len(output_node.inputs[0].links) == 0: + node_group.links.new(cut_node.outputs[0], + output_node.inputs[0]) + move_node_to_node(cut_node, output_node, (-300, 0)) + else: + pre_output_node = output_node.inputs[0].links[0].from_node + node_group.links.new(pre_output_node.outputs[0], + cut_node.inputs[0]) + node_group.links.new(cut_node.outputs[0], + output_node.inputs[0]) + move_node_between_nodes(cut_node, + [pre_output_node, output_node]) + + node_group.links.new(cutter_node.outputs[0], + cut_node.inputs[1]) + + move_node_to_node(cutter_node, cut_node, (-300, -300)) + select_object(cutter_obj) + else: + move_node_to_node(cutter_node, output_node, (0, -100)) + select_object(container_obj) + + return {'FINISHED'} + + +class AddPlaneCutter(bpy.types.Operator, AddCutter): + bl_idname = "bioxelnodes.add_plane_cutter" + bl_label = "Add a Plane Cutter" + bl_description = "Add a Plane Cutter to Container" + object_type = "plane" + + +class AddCylinderCutter(bpy.types.Operator, AddCutter): + bl_idname = "bioxelnodes.add_cylinder_cutter" + bl_label = "Add a Cylinder Cutter" + bl_description = "Add a Cylinder Cutter to Container" + object_type = "cylinder" + + +class AddCubeCutter(bpy.types.Operator, AddCutter): + bl_idname = "bioxelnodes.add_cube_cutter" + bl_label = "Add a Cube Cutter" + bl_description = "Add a Cube Cutter to Container" + object_type = "cube" + + +class AddSphereCutter(bpy.types.Operator, AddCutter): + bl_idname = "bioxelnodes.add_sphere_cutter" + bl_label = "Add a Sphere Cutter" + bl_description = "Add a Sphere Cutter to Container" + object_type = "sphere" + + +class AddPieCutter(bpy.types.Operator, AddCutter): + bl_idname = "bioxelnodes.add_pie_cutter" + bl_label = "Add a Pie Cutter" + bl_description = "Add a Pie Cutter to Container" + object_type = "pie" diff --git a/bioxelnodes/operators/io.py b/bioxelnodes/operators/io.py new file mode 100644 index 0000000..723037b --- /dev/null +++ b/bioxelnodes/operators/io.py @@ -0,0 +1,808 @@ +import math +import bpy +import shutil +import threading +import numpy as np +from pathlib import Path + + +from ..exceptions import CancelledByUser +from ..props import BIOXELNODES_Series +from ..bioxel.layer import Layer +from ..bioxelutils.layer import (get_all_layer_objs, + get_layer_obj) +from ..bioxelutils.container import (Container, + add_layers, + container_to_obj, + get_container_objs_from_selection) +from ..bioxel.parse import (DICOM_EXTS, SUPPORT_EXTS, + get_ext, parse_volumetric_data) +from .utils import (get_cache_dir, get_preferences, + progress_update, progress_bar, select_object) + +# 3rd-party +import SimpleITK as sitk +import transforms3d + +FH_EXTS = ['', '.dcm', '.DCM', '.DICOM', '.ima', '.IMA', + '.gipl', '.gipl.gz', + '.mnc', '.MNC', + '.mrc', '.rec', + '.mha', '.mhd', + '.nia', '.nii', '.nii.gz', '.hdr', '.img', '.img.gz', + '.hdf', '.h4', '.hdf4', '.he2', '.h5', '.hdf5', '.he5', + '.nrrd', '.nhdr', + '.vtk', + '.gz' + '.ome.tiff', '.ome.tif', + '.mrc', '.mrc.gz', '.map', '.map.gz'] + + +def get_layer_shape(bioxel_size: float, orig_shape: tuple, orig_spacing: tuple): + shape = (int(orig_shape[0] / bioxel_size * orig_spacing[0]), + int(orig_shape[1] / bioxel_size * orig_spacing[1]), + int(orig_shape[2] / bioxel_size * orig_spacing[2])) + + return (shape[0] if shape[0] > 0 else 1, + shape[1] if shape[1] > 0 else 1, + shape[2] if shape[2] > 0 else 1) + + +def get_layer_size(shape: tuple, bioxel_size: float, scale: float = 1.0): + size = (float(shape[0] * bioxel_size * scale), + float(shape[1] * bioxel_size * scale), + float(shape[2] * bioxel_size * scale)) + + return size + + +""" +ImportVolumetricData + -> ParseVolumetricData -> ImportVolumetricDataDialog +FH_ImportVolumetricData + + start import parse data execute import +""" + + +class ImportVolumetricData(): + bl_options = {'UNDO'} + + filepath: bpy.props.StringProperty(subtype="FILE_PATH") # type: ignore + directory: bpy.props.StringProperty(subtype='DIR_PATH') # type: ignore + + read_as = "scalar" + + def execute(self, context): + container_objs = get_container_objs_from_selection() + + if len(container_objs) > 0: + bpy.ops.bioxelnodes.parse_volumetric_data('INVOKE_DEFAULT', + filepath=self.filepath, + directory=self.directory, + container_obj_name=container_objs[0].name, + read_as=self.read_as) + else: + bpy.ops.bioxelnodes.parse_volumetric_data('INVOKE_DEFAULT', + filepath=self.filepath, + directory=self.directory, + read_as=self.read_as) + + return {'FINISHED'} + + def invoke(self, context, event): + context.window_manager.fileselect_add(self) + return {'RUNNING_MODAL'} + + +class ImportAsScalarLayer(bpy.types.Operator, ImportVolumetricData): + bl_idname = "bioxelnodes.import_as_scalar_layer" + bl_label = "Import as Scalar" + bl_description = "Import Volumetric Data to Container as Scalar" + read_as = "scalar" + + +class ImportAsLabelLayer(bpy.types.Operator, ImportVolumetricData): + bl_idname = "bioxelnodes.import_as_label_layer" + bl_label = "Import as Label" + bl_description = "Import Volumetric Data to Container as Label" + read_as = "label" + + +class BIOXELNODES_FH_ImportVolumetricData(bpy.types.FileHandler): + bl_idname = "BIOXELNODES_FH_ImportVolumetricData" + bl_label = "File handler for dicom import" + bl_import_operator = "bioxelnodes.parse_volumetric_data" + bl_file_extensions = ";".join(FH_EXTS) + + @classmethod + def poll_drop(cls, context): + return (context.area and context.area.type == 'VIEW_3D') + + +def get_series_ids(self, context): + items = [] + for index, series_id in enumerate(self.series_ids): + items.append(( + series_id.id, + series_id.label, + "", + index + )) + + return items + + +class ParseVolumetricData(bpy.types.Operator): + bl_idname = "bioxelnodes.parse_volumetric_data" + bl_label = "Import Volumetric Data" + bl_description = "Import Volumetric Data as Layer" + bl_options = {'UNDO'} + + meta = None + thread = None + _timer = None + + progress: bpy.props.FloatProperty(name="Progress", + options={"SKIP_SAVE"}, + default=1) # type: ignore + + filepath: bpy.props.StringProperty(subtype="FILE_PATH") # type: ignore + directory: bpy.props.StringProperty(subtype='DIR_PATH') # type: ignore + container_obj_name: bpy.props.StringProperty() # type: ignore + + read_as: bpy.props.EnumProperty(name="Read as", + default="scalar", + items=[("scalar", "Scalar", ""), + ("label", "Labels", "")]) # type: ignore + + series_id: bpy.props.EnumProperty(name="Select Series", + items=get_series_ids) # type: ignore + + series_ids: bpy.props.CollectionProperty( + type=BIOXELNODES_Series) # type: ignore + + def execute(self, context): + data_path = Path(self.filepath).resolve() + ext = get_ext(data_path) + if ext not in SUPPORT_EXTS: + self.report({"WARNING"}, "Not supported extension.") + return {'CANCELLED'} + + print("Collecting Meta Data...") + + def parse_volumetric_data_func(self, context, cancel): + def progress_callback(factor, text): + if cancel(): + raise CancelledByUser + progress_update(context, factor, text) + + try: + series_id = self.series_id if self.series_id != "empty" else "" + data, meta = parse_volumetric_data(data_file=self.filepath, + series_id=series_id, + progress_callback=progress_callback) + except CancelledByUser: + return + except Exception as e: + self.has_error = e + return + + if cancel(): + return + + self.meta = meta + + # Init cancel flag + self.is_cancelled = False + self.has_error = None + + # Create the thread + self.thread = threading.Thread(target=parse_volumetric_data_func, + args=(self, context, lambda: self.is_cancelled)) + + # Start the thread + self.thread.start() + # Add a timmer for modal + self._timer = context.window_manager.event_timer_add(time_step=0.1, + window=context.window) + # Append progress bar to status bar + bpy.types.STATUSBAR_HT_header.append(progress_bar) + + # Start modal handler + context.window_manager.modal_handler_add(self) + return {'RUNNING_MODAL'} + + def modal(self, context, event): + # Check if user press 'ESC' + if event.type == 'ESC': + self.is_cancelled = True + progress_update(context, 0, "Canceling...") + return {'PASS_THROUGH'} + + # Check if is the timer time + if event.type != 'TIMER': + return {'PASS_THROUGH'} + + # Force update status bar + bpy.context.workspace.status_text_set_internal(None) + + # Check if thread is still running + if self.thread.is_alive(): + return {'PASS_THROUGH'} + + # Release the thread + self.thread.join() + # Remove the timer + context.window_manager.event_timer_remove(self._timer) + # Remove the progress bar from status bar + bpy.types.STATUSBAR_HT_header.remove(progress_bar) + + # Check if thread is cancelled by user + if self.is_cancelled: + self.report({"WARNING"}, "Canncelled by user.") + return {'CANCELLED'} + + # Check if thread is cancelled by user + if self.has_error: + raise self.has_error + + # Check if has return + if self.meta is None: + self.report({"ERROR"}, "Some thing went wrong.") + return {'CANCELLED'} + + # If not canncelled... + for key, value in self.meta.items(): + print(f"{key}: {value}") + + orig_shape = self.meta['xyz_shape'] + orig_spacing = self.meta['spacing'] + min_size = min(orig_spacing[0], + orig_spacing[1], orig_spacing[2]) + bioxel_size = max(min_size, 1.0) + + layer_shape = get_layer_shape(1, orig_shape, orig_spacing) + layer_size = get_layer_size(layer_shape, + bioxel_size) + log10 = math.floor(math.log10(max(*layer_size))) + log10 = max(1, log10) + log10 = min(3, log10) + scene_scale = math.pow(10, -log10) + + if self.container_obj_name: + container_obj = bpy.data.objects.get(self.container_obj_name) + container_name = container_obj.name + else: + container_name = self.meta['name'] + + series_id = self.series_id if self.series_id != "empty" else "" + bpy.ops.bioxelnodes.import_volumetric_data_dialog( + 'INVOKE_DEFAULT', + filepath=self.filepath, + container_name=container_name, + layer_name=self.meta['description'], + orig_shape=orig_shape, + orig_spacing=orig_spacing, + bioxel_size=bioxel_size, + series_id=series_id, + frame_count=self.meta['frame_count'], + channel_count=self.meta['channel_count'], + container_obj_name=self.container_obj_name, + read_as=self.read_as, + scene_scale=scene_scale + ) + + self.report({"INFO"}, "Successfully Readed.") + return {'FINISHED'} + + def invoke(self, context, event): + if not self.filepath and not self.directory: + return {'CANCELLED'} + + data_path = Path(self.filepath).resolve() + ext = get_ext(data_path) + + # Series Selection + if ext in DICOM_EXTS: + data_dirpath = data_path.parent + reader = sitk.ImageSeriesReader() + reader.MetaDataDictionaryArrayUpdateOn() + reader.LoadPrivateTagsOn() + + series_ids = reader.GetGDCMSeriesIDs(str(data_dirpath)) + series_items = {} + + for series_id in series_ids: + series_files = reader.GetGDCMSeriesFileNames( + str(data_dirpath), series_id) + single = sitk.ImageFileReader() + single.SetFileName(series_files[0]) + single.LoadPrivateTagsOn() + single.ReadImageInformation() + + def get_meta(key): + try: + stirng = single.GetMetaData(key).removesuffix(" ") + if stirng in ["No study description", + "No series description", + ""]: + return "Unknown" + else: + return stirng + except: + return "Unknown" + + study_description = get_meta("0008|1030") + series_description = get_meta("0008|103e") + series_modality = get_meta("0008|0060") + size_x = get_meta("0028|0011") + size_y = get_meta("0028|0010") + count = get_meta("0020|0013") + count = count if count != "Unknown" else 1 + + # some series image count = 0 ???? + if int(count) == 0: + continue + + # series_id cannot be "" in blender selection + if series_id == "": + series_id = "empty" + + series_items[series_id] = "{:<20} {:>1}".format(f"{study_description}>{series_description}({series_modality})", + f"({size_x}x{size_y})x{count}") + + for key, value in series_items.items(): + series_item = self.series_ids.add() + series_item.id = key + series_item.label = value + + if len(series_items.keys()) > 1: + context.window_manager.invoke_props_dialog(self, + width=400, + title="Which series to import?") + return {'RUNNING_MODAL'} + elif len(series_items.keys()) == 1: + self.series_id = list(series_items.keys())[0] + else: + self.report({"ERROR"}, "Get no vaild series.") + return {'CANCELLED'} + + self.execute(context) + return {'RUNNING_MODAL'} + + def draw(self, context): + layout = self.layout + layout.label( + text='Detect multi-series in DICOM, pick one') + layout.prop(self, "series_id") + + +def get_sequence_sources(self, context): + items = [("-1", "None (Static)", "")] + orig_shape = tuple(self.orig_shape) + if self.frame_count > 1: + items.append(("0", f"Frame (Get {self.frame_count} frames)", "")) + elif self.frame_count == 1 and self.channel_count > 1: + items.append(("4", f"Channel (Get {self.channel_count} frames)", "")) + elif self.frame_count == 1 and self.channel_count == 1: + items.append(("1", f"X (Get {orig_shape[0]} frames)", "")) + items.append(("2", f"Y (Get {orig_shape[1]} frames)", "")) + items.append(("3", f"Z (Get {orig_shape[2]} frames)", "")) + + return items + + +class ImportVolumetricDataDialog(bpy.types.Operator): + bl_idname = "bioxelnodes.import_volumetric_data_dialog" + bl_label = "Import Volumetric Data" + bl_description = "Import Volumetric Data as Layer" + bl_options = {'UNDO'} + + layers = None + thread = None + _timer = None + + filepath: bpy.props.StringProperty(subtype="FILE_PATH") # type: ignore + + container_name: bpy.props.StringProperty( + name="Container Name") # type: ignore + + layer_name: bpy.props.StringProperty(name="Layer Name") # type: ignore + + series_id: bpy.props.StringProperty() # type: ignore + + container_obj_name: bpy.props.StringProperty() # type: ignore + + frame_count: bpy.props.IntProperty() # type: ignore + + channel_count: bpy.props.IntProperty() # type: ignore + + read_as: bpy.props.EnumProperty(name="Read as", + default="scalar", + items=[("scalar", "Scalar", ""), + ("label", "Labels", "")]) # type: ignore + + bioxel_size: bpy.props.FloatProperty(name="Bioxel Size (Larger size means small resolution)", + soft_min=0.1, soft_max=10.0, + min=0.1, max=1e2, + default=1) # type: ignore + + orig_spacing: bpy.props.FloatVectorProperty(name="Original Spacing", + default=(1, 1, 1)) # type: ignore + + orig_shape: bpy.props.IntVectorProperty(name="Original Shape", + default=(100, 100, 100)) # type: ignore + + scene_scale: bpy.props.FloatProperty(name="Scene Scale (Bioxel Unit pre Blender Unit)", + soft_min=0.0001, soft_max=10.0, + min=1e-6, max=1e6, + default=0.01) # type: ignore + + split_channels: bpy.props.BoolProperty(name="Split Channels", + default=False) # type: ignore + + sequence_source: bpy.props.EnumProperty(name="Time Sequence From", + items=get_sequence_sources) # type: ignore + + def execute(self, context): + def import_volumetric_data_func(self, context, cancel): + progress_update(context, 0.0, "Parsing Volumetirc Data...") + + def progress_callback(factor, text): + if cancel(): + raise CancelledByUser + progress_update(context, factor*0.2, text) + + try: + data, meta = parse_volumetric_data(data_file=self.filepath, + series_id=self.series_id, + progress_callback=progress_callback) + except CancelledByUser: + return + except Exception as e: + self.has_error = e + return + + if cancel(): + return + + shape = get_layer_shape(self.bioxel_size, + self.orig_shape, + self.orig_spacing) + + mat_scale = transforms3d.zooms.zfdir2aff(self.bioxel_size) + affine = np.dot(meta['affine'], mat_scale) + kind = self.read_as + + if cancel(): + return + + # change shape as sequence or not + if self.sequence_source == "-1": + data = data[0:1, :, :, :, :] + elif self.sequence_source == "0": + # frame as frame + pass + elif self.sequence_source == "1": + # X as frame + data = data.transpose(1, 0, 2, 3, 4) + shape = (1, shape[1], shape[2]) + elif self.sequence_source == "2": + # Y as frame + data = data.transpose(2, 1, 0, 3, 4) + shape = (shape[0], 1, shape[2]) + elif self.sequence_source == "3": + # Z as frame + data = data.transpose(3, 1, 2, 0, 4) + shape = (shape[0], shape[1], 1) + else: + # channel as frame + data = data.transpose(4, 1, 2, 3, 0) + + def progress_callback_factory(layer_name, progress, progress_step): + def progress_callback(frame, total): + if cancel(): + raise CancelledByUser + sub_progress_step = progress_step/total + sub_progress = progress + frame * sub_progress_step + progress_update(context, sub_progress, + f"Processing {layer_name} Frame {frame+1}...") + return progress_callback + + layers = [] + if kind == "label": + name = self.layer_name or "Label" + data = data.astype(int) + label_count = int(np.max(data)) + progress_step = 0.7/label_count + + for i in range(label_count): + if cancel(): + return + + name_i = f"{name}_{i+1}" + progress = 0.2+i*progress_step + progress_update(context, progress, + f"Processing {name_i}...") + + progress_callback = progress_callback_factory(name_i, + progress, + progress_step) + try: + layer = Layer(data=data == np.full_like(data, i+1), + name=name_i, + kind=kind, + affine=affine) + + layer.resize(shape=shape, + progress_callback=progress_callback) + + layers.append(layer) + except CancelledByUser: + return + except Exception as e: + self.has_error = e + return + + elif kind == "scalar": + name = self.layer_name or "Scalar" + + if self.split_channels: + progress_step = 0.7/self.channel_count + + for i in range(self.channel_count): + if cancel(): + return + + name_i = f"{name}_{i+1}" + progress = 0.2 + i*progress_step + progress_update(context, progress, + f"Processing {name_i}...") + progress_callback = progress_callback_factory(name_i, + progress, + progress_step) + try: + layer = Layer(data=data[:, :, :, :, i:i+1], + name=name_i, + kind=kind, + affine=affine) + + layer.resize(shape=shape, + progress_callback=progress_callback) + + layers.append(layer) + except CancelledByUser: + return + except Exception as e: + self.has_error = e + return + else: + if cancel(): + return + + progress_update(context, 0.2, + f"Processing {name}...") + progress_callback = progress_callback_factory(name, + 0.2, + 0.7) + + try: + layer = Layer(data=data, + name=name, + kind=kind, + affine=affine) + + layer.resize(shape=shape, + progress_callback=progress_callback) + + layers.append(layer) + except CancelledByUser: + return + except Exception as e: + self.has_error = e + return + + if cancel(): + return + + self.layers = layers + progress_update(context, 0.9, "Creating Layers...") + + self.is_cancelled = False + self.has_error = None + + self.thread = threading.Thread(target=import_volumetric_data_func, + args=(self, context, lambda: self.is_cancelled)) + + self.thread.start() + self._timer = context.window_manager.event_timer_add(time_step=0.1, + window=context.window) + bpy.types.STATUSBAR_HT_header.append(progress_bar) + + context.window_manager.modal_handler_add(self) + return {'RUNNING_MODAL'} + + def modal(self, context, event): + if event.type == 'ESC': + self.is_cancelled = True + progress_update(context, 0, "Canceling...") + return {'PASS_THROUGH'} + + if event.type != 'TIMER': + return {'PASS_THROUGH'} + + bpy.context.workspace.status_text_set_internal(None) + if self.thread.is_alive(): + return {'PASS_THROUGH'} + + self.thread.join() + context.window_manager.event_timer_remove(self._timer) + bpy.types.STATUSBAR_HT_header.remove(progress_bar) + + if self.is_cancelled: + self.report({"WARNING"}, "Canncelled by user.") + return {'CANCELLED'} + + # Check if thread is cancelled by user + if self.has_error: + raise self.has_error + + # Check if has return + if self.layers is None: + self.report({"ERROR"}, "Some thing went wrong.") + return {'CANCELLED'} + + is_first_import = len(get_all_layer_objs()) == 0 + + if self.container_obj_name: + container_obj = bpy.data.objects.get(self.container_obj_name) + if container_obj is None: + raise Exception("Could not find target container") + + container_obj = add_layers(self.layers, + container_obj=container_obj, + cache_dir=get_cache_dir(context)) + else: + container = Container(name=self.container_name, + layers=self.layers) + + container_obj = container_to_obj(container, + scene_scale=self.scene_scale, + cache_dir=get_cache_dir(context)) + + select_object(container_obj) + + # Change render setting for better result + preferences = get_preferences(context) + if preferences.do_change_render_setting and is_first_import: + bpy.context.scene.render.engine = 'CYCLES' + try: + bpy.context.scene.cycles.shading_system = True + bpy.context.scene.cycles.volume_bounces = 12 + bpy.context.scene.cycles.transparent_max_bounces = 16 + bpy.context.scene.cycles.volume_preview_step_rate = 10 + bpy.context.scene.cycles.volume_step_rate = 10 + except: + pass + + try: + bpy.context.scene.eevee.use_taa_reprojection = False + bpy.context.scene.eevee.volumetric_tile_size = '2' + bpy.context.scene.eevee.volumetric_shadow_samples = 128 + bpy.context.scene.eevee.volumetric_samples = 256 + bpy.context.scene.eevee.use_volumetric_shadows = True + except: + pass + + self.report({"INFO"}, "Successfully Imported") + return {'FINISHED'} + + def invoke(self, context, event): + if self.read_as == "label": + volume_dtype = "Label" + elif self.read_as == "scalar": + volume_dtype = "Scalar" + title = f"As {volume_dtype} Opitons (Add to Container: {self.container_obj_name})" \ + if self.container_obj_name != "" else f"As {volume_dtype} Options (Init a Container)" + context.window_manager.invoke_props_dialog(self, + width=500, + title=title) + return {'RUNNING_MODAL'} + + def draw(self, context): + layer_shape = get_layer_shape(self.bioxel_size, + self.orig_shape, + self.orig_spacing) + + orig_shape = tuple(self.orig_shape) + + # change shape as sequence or not + channel_count = self.channel_count + if self.sequence_source == "-1": + pass + elif self.sequence_source == "0": + # frame as frame + pass + elif self.sequence_source == "1": + layer_shape = (1, layer_shape[1], layer_shape[2]) + elif self.sequence_source == "2": + layer_shape = (layer_shape[0], 1, layer_shape[2]) + elif self.sequence_source == "3": + layer_shape = (layer_shape[0], layer_shape[1], 1) + else: + channel_count = 1 + + import_channel = channel_count if self.split_channels or channel_count == 1 else "combined" + + bioxel_count = layer_shape[0] * layer_shape[1] * layer_shape[2] + layer_shape_text = f"Shape from {str(orig_shape)} to {str(layer_shape)}" + if bioxel_count > 100000000: + layer_shape_text += "**TOO LARGE!**" + + layout = self.layout + if self.container_obj_name == "": + layout.prop(self, "container_name") + layout.prop(self, "layer_name") + + panel = layout.box() + panel.prop(self, "bioxel_size") + row = panel.row() + row.prop(self, "orig_spacing") + panel.label(text=layer_shape_text) + + panel = layout.box() + panel.prop(self, "sequence_source") + + if self.read_as == "scalar": + panel = layout.box() + panel.prop(self, "split_channels", + text=f"Split Channels (Get {channel_count} channels, import {import_channel} channels)") + + if self.container_obj_name == "": + layer_size = get_layer_size(layer_shape, + self.bioxel_size, + self.scene_scale) + layer_size_text = f"Size will be: ({layer_size[0]:.2f}, {layer_size[1]:.2f}, {layer_size[2]:.2f}) m" + panel = layout.box() + panel.prop(self, "scene_scale") + panel.label(text=layer_size_text) + + +class ExportVolumetricData(bpy.types.Operator): + bl_idname = "bioxelnodes.export_volumetric_data" + bl_label = "Export Layer as VDB" + bl_description = "Export Layer as VDB" + bl_options = {'UNDO'} + + filepath: bpy.props.StringProperty( + subtype="FILE_PATH" + ) # type: ignore + + filename_ext = ".vdb" + + @classmethod + def poll(cls, context): + layer_obj = get_layer_obj(bpy.context.active_object) + return True if layer_obj else False + + def invoke(self, context, event): + context.window_manager.fileselect_add(self) + return {'RUNNING_MODAL'} + + def execute(self, context): + layer_obj = get_layer_obj(bpy.context.active_object) + + filepath = f"{self.filepath.split('.')[0]}.vdb" + # "//" + source_dir = bpy.path.abspath(layer_obj.data.filepath) + + output_path: Path = Path(filepath).resolve() + source_path: Path = Path(source_dir).resolve() + # print('output_path', output_path) + # print('source_path', source_path) + shutil.copy(source_path, output_path) + + self.report({"INFO"}, f"Successfully exported to {output_path}") + + return {'FINISHED'} diff --git a/bioxelnodes/operators/layer.py b/bioxelnodes/operators/layer.py new file mode 100644 index 0000000..1fdf666 --- /dev/null +++ b/bioxelnodes/operators/layer.py @@ -0,0 +1,251 @@ +from pathlib import Path +import bpy + +import numpy as np + + +from ..bioxel.layer import Layer +from ..bioxelutils.node import get_nodes_by_type +from ..bioxelutils.container import add_layers, get_container_obj +from ..bioxelutils.layer import obj_to_layer, get_container_layer_objs, get_layer_obj +from .utils import get_preferences, select_object + + +def get_layer_prop_value(layer_obj: bpy.types.Object, prop: str): + try: + node_group = layer_obj.modifiers[0].node_group + layer_node = get_nodes_by_type(node_group, "BioxelNodes__Layer")[0] + return layer_node.inputs[prop].default_value + except: + return None + + +def get_label_layer_selection(self, context): + items = [("None", "None", "")] + container_obj = get_container_obj(bpy.context.active_object) + + for layer_obj in get_container_layer_objs(container_obj): + if get_layer_prop_value(layer_obj, "kind") == "label": + items.append((layer_obj.name, + layer_obj.name, + "")) + + return items + + +class LayerOperator(): + bl_options = {'UNDO'} + base_obj: bpy.types.Object = None + + def add_layer(self, context, layer): + preferences = get_preferences(context) + cache_dir = Path(preferences.cache_dir, 'VDBs') + container_obj = self.base_obj.parent + + add_layers([layer], + container_obj, + cache_dir) + + select_object(container_obj) + + def invoke(self, context, event): + self.base_obj = get_layer_obj(bpy.context.active_object) + return self.execute(context) + + +class ScalarOperator(LayerOperator): + @classmethod + def poll(cls, context): + label_objs = [obj for obj in context.selected_ids + if get_layer_prop_value(obj, "kind") == "scalar"] + return True if len(label_objs) > 0 else False + + +class LabelOperator(LayerOperator): + @classmethod + def poll(cls, context): + label_objs = [obj for obj in context.selected_ids + if get_layer_prop_value(obj, "kind") == "label"] + return True if len(label_objs) > 0 else False + + +class SignScalar(bpy.types.Operator, ScalarOperator): + bl_idname = "bioxelnodes.sign_scalar" + bl_label = "Sign Scalar" + bl_description = "Sign the scalar value" + + def execute(self, context): + base_layer = obj_to_layer(self.base_obj) + + modified_layer = base_layer.copy() + modified_layer.data = -base_layer.data + modified_layer.name = f"{base_layer.name}_Signed" + + self.add_layer(context, modified_layer) + return {'FINISHED'} + + +class FillOperator(ScalarOperator): + def invoke(self, context, event): + self.base_obj = get_layer_obj(bpy.context.active_object) + scalar_min = get_layer_prop_value(self.base_obj, "min") + self.fill_value = min(scalar_min, 0) + context.window_manager.invoke_props_dialog(self, width=400) + return {'RUNNING_MODAL'} + + +class FillByThreshold(bpy.types.Operator, FillOperator): + bl_idname = "bioxelnodes.fill_by_threshold" + bl_label = "Fill Value by Threshold" + bl_description = "Fill Value by Threshold" + + threshold: bpy.props.FloatProperty( + name="Threshold", + soft_min=0, soft_max=1024, + default=128, + ) # type: ignore + + fill_value: bpy.props.FloatProperty( + name="Fill Value", + soft_min=0, soft_max=1024.0, + default=0, + ) # type: ignore + + invert: bpy.props.BoolProperty( + name="Invert Area", + default=True, + ) # type: ignore + + def execute(self, context): + base_layer = obj_to_layer(self.base_obj) + + data = np.amax(base_layer.data, -1) + mask = data <= self.threshold \ + if self.invert else data > self.threshold + + modified_layer = base_layer.copy() + modified_layer.fill(self.fill_value, mask) + modified_layer.name = f"{base_layer.name}_{self.threshold}-Filled" + + self.add_layer(context, modified_layer) + + return {'FINISHED'} + + +class FillByRange(bpy.types.Operator, FillOperator): + bl_idname = "bioxelnodes.fill_by_range" + bl_label = "Fill Value by Range" + bl_description = "Fill Value by Range" + + from_min: bpy.props.FloatProperty( + name="From Min", + soft_min=0, soft_max=1024, + default=128, + ) # type: ignore + + from_max: bpy.props.FloatProperty( + name="From Max", + soft_min=0, soft_max=1024, + default=256, + ) # type: ignore + + fill_value: bpy.props.FloatProperty( + name="Fill Value", + soft_min=0, soft_max=1024.0, + default=0, + ) # type: ignore + + invert: bpy.props.BoolProperty( + name="Invert Area", + default=True, + ) # type: ignore + + def execute(self, context): + base_layer = obj_to_layer(self.base_obj) + + data = np.amax(base_layer.data, -1) + mask = (data <= self.from_min) | (data >= self.from_max) if self.invert else \ + (data > self.from_min) & (data < self.from_max) + + modified_layer = base_layer.copy() + modified_layer.fill(self.fill_value, mask) + modified_layer.name = f"{base_layer.name}_{self.from_min}-{self.from_max}-Filled" + + self.add_layer(context, modified_layer) + return {'FINISHED'} + + +class FillByLabel(bpy.types.Operator, FillOperator): + bl_idname = "bioxelnodes.fill_by_label" + bl_label = "Fill Value by Label" + bl_description = "Fill Value by Label Area" + + label_obj_name: bpy.props.EnumProperty( + name="Label Layer", + items=get_label_layer_selection + ) # type: ignore + + fill_value: bpy.props.FloatProperty( + name="Fill Value", + soft_min=0, soft_max=1024.0, + default=0, + ) # type: ignore + + invert: bpy.props.BoolProperty( + name="Invert Label", + default=True, + ) # type: ignore + + def execute(self, context): + label_obj = bpy.data.objects.get(self.label_obj_name) + if not label_obj: + self.report({"WARNING"}, "Cannot find any label layer.") + return {'FINISHED'} + + base_layer = obj_to_layer(self.base_obj) + + label_layer = obj_to_layer(label_obj) + label_layer.resize(base_layer.shape) + mask = np.amax(label_layer.data, -1) + if self.invert: + mask = 1 - mask + + modified_layer = base_layer.copy() + modified_layer.fill(self.fill_value, mask) + modified_layer.name = f"{base_layer.name}_{label_layer.name}-Filled" + + self.add_layer(context, modified_layer) + return {'FINISHED'} + + +class CombineLabels(bpy.types.Operator, LabelOperator): + bl_idname = "bioxelnodes.combine_labels" + bl_label = "Combine Labels" + bl_description = "Combine all selected labels" + + def execute(self, context): + label_objs = [obj for obj in context.selected_ids + if get_layer_prop_value(obj, "kind") == "label"] + + if len(label_objs) < 2: + self.report({"WARNING"}, "Not enough layers.") + return {'FINISHED'} + base_obj = label_objs[0] + label_objs = label_objs[1:] + container_obj = base_obj.parent + + base_layer = obj_to_layer(base_obj) + modified_layer = base_layer.copy() + label_names = [base_layer.name] + + for label_obj in label_objs: + label_layer = obj_to_layer(label_obj) + label_layer.resize(base_layer.shape) + modified_layer.data = np.maximum(base_layer.data, label_layer.data) + label_names.append(label_layer.name) + + modified_layer.name = f"{'-'.join(label_names)}-Combined" + + self.add_layer(context, modified_layer) + + return {'FINISHED'} diff --git a/bioxelnodes/save.py b/bioxelnodes/operators/misc.py similarity index 84% rename from bioxelnodes/save.py rename to bioxelnodes/operators/misc.py index eb2869a..f988f12 100644 --- a/bioxelnodes/save.py +++ b/bioxelnodes/operators/misc.py @@ -2,8 +2,13 @@ import bpy from pathlib import Path import shutil -from .utils import copy_to_dir, get_all_layers, get_container, get_container_from_selection, get_container_layers -from .nodes import custom_nodes + + +from ..utils import copy_to_dir +from .utils import get_cache_dir +from ..nodes import custom_nodes +from ..bioxelutils.container import get_container_objs_from_selection +from ..bioxelutils.layer import get_all_layer_objs, get_container_layer_objs CLASS_PREFIX = "BIOXELNODES_MT_NODES" @@ -27,6 +32,30 @@ def execute(self, context): return {'FINISHED'} +def save_layer_cache(layer_obj, output_dir): + pattern = r'\.\d{4}\.' + + # "//" + output_dir = bpy.path.abspath(output_dir) + source_dir = bpy.path.abspath(layer_obj.data.filepath) + + source_path: Path = Path(source_dir).resolve() + is_sequence = re.search(pattern, source_path.name) is not None + name = layer_obj.name if is_sequence else f"{layer_obj.name}.vdb" + output_path: Path = Path(output_dir, name, source_path.name).resolve() \ + if is_sequence else Path(output_dir, name).resolve() + + if output_path != source_path: + copy_to_dir(source_path.parent if is_sequence else source_path, + output_path.parent.parent if is_sequence else output_path.parent, + new_name=name) + + blend_path = Path(bpy.path.abspath("//")).resolve() + + layer_obj.data.filepath = bpy.path.relpath( + str(output_path), start=str(blend_path)) + + class SaveStagedData(bpy.types.Operator): bl_idname = "bioxelnodes.save_staged_data" bl_label = "Save Staged Data" @@ -85,7 +114,7 @@ def execute(self, context): if self.save_layer: fails = [] - for layer in get_all_layers(): + for layer in get_all_layer_objs(): try: save_layer(layer, self.cache_dir) except: @@ -118,35 +147,10 @@ def draw(self, context): panel.prop(self, "lib_dir") -def save_layer(layer, output_dir): - - pattern = r'\.\d{4}\.' - - # "//" - output_dir = bpy.path.abspath(output_dir) - source_dir = bpy.path.abspath(layer.data.filepath) - - source_path: Path = Path(source_dir).resolve() - is_sequence = re.search(pattern, source_path.name) is not None - name = layer.name if is_sequence else f"{layer.name}.vdb" - output_path: Path = Path(output_dir, name, source_path.name).resolve() \ - if is_sequence else Path(output_dir, name).resolve() - - if output_path != source_path: - copy_to_dir(source_path.parent if is_sequence else source_path, - output_path.parent.parent if is_sequence else output_path.parent, - new_name=name) - - blend_path = Path(bpy.path.abspath("//")).resolve() - - layer.data.filepath = bpy.path.relpath( - str(output_path), start=str(blend_path)) - - -class SaveLayers(bpy.types.Operator): +class SaveCaches(bpy.types.Operator): bl_idname = "bioxelnodes.save_layers" - bl_label = "Save Layers" - bl_description = "Save Container Layers to Directory." + bl_label = "Save Caches" + bl_description = "Save Container's caches to directory." cache_dir: bpy.props.StringProperty( name="Layer Directory", @@ -156,23 +160,23 @@ class SaveLayers(bpy.types.Operator): @classmethod def poll(cls, context): - containers = get_container_from_selection() - return len(containers) > 0 + container_objs = get_container_objs_from_selection() + return len(container_objs) > 0 def execute(self, context): - containers = get_container_from_selection() + container_objs = get_container_objs_from_selection() - if len(containers) == 0: + if len(container_objs) == 0: self.report({"WARNING"}, "Cannot find any bioxel container.") return {'FINISHED'} fails = [] - for container in containers: - for layer in get_container_layers(container): + for container_obj in container_objs: + for layer_obj in get_container_layer_objs(container_obj): try: - save_layer(layer, self.cache_dir) + save_layer_cache(layer_obj, self.cache_dir) except: - fails.append(layer) + fails.append(layer_obj) if len(fails) == 0: self.report({"INFO"}, f"Successfully saved bioxel layers.") @@ -194,8 +198,7 @@ class CleanAllCaches(bpy.types.Operator): bl_description = "Clean all caches saved in temp" def execute(self, context): - preferences = context.preferences.addons[__package__].preferences - cache_dir = Path(preferences.cache_dir, 'VDBs') + cache_dir = get_cache_dir(context) try: shutil.rmtree(cache_dir) self.report({"INFO"}, f"Successfully cleaned caches.") diff --git a/bioxelnodes/operators/utils.py b/bioxelnodes/operators/utils.py new file mode 100644 index 0000000..6298f3c --- /dev/null +++ b/bioxelnodes/operators/utils.py @@ -0,0 +1,37 @@ +import bpy +from pathlib import Path +from .. import __package__ as base_package + + +def select_object(target_obj): + for obj in bpy.data.objects: + obj.select_set(False) + + target_obj.select_set(True) + bpy.context.view_layer.objects.active = target_obj + + +def progress_bar(self, context): + row = self.layout.row() + row.progress( + factor=context.window_manager.bioxelnodes_progress_factor, + type="BAR", + text=context.window_manager.bioxelnodes_progress_text + ) + row.scale_x = 2 + + +def progress_update(context, factor, text=""): + context.window_manager.bioxelnodes_progress_factor = factor + context.window_manager.bioxelnodes_progress_text = text + + +def get_preferences(context): + return context.preferences.addons[base_package].preferences + + +def get_cache_dir(context): + preferences = get_preferences(context) + cache_path = Path(preferences.cache_dir, 'VDBs') + cache_path.mkdir(parents=True, exist_ok=True) + return str(cache_path) diff --git a/bioxelnodes/parse.py b/bioxelnodes/parse.py deleted file mode 100644 index c35d505..0000000 --- a/bioxelnodes/parse.py +++ /dev/null @@ -1,408 +0,0 @@ -from pathlib import Path -import numpy as np - -from .exceptions import CancelledByUser -from .utils import get_text_index_str - -try: - import SimpleITK as sitk - from pyometiff import OMETIFFReader - import mrcfile -except: - ... - -""" -Convert any volumetric data to 3D numpy array with order TXYZC -""" - -SUPPORT_EXTS = ['', '.dcm', '.DCM', '.DICOM', '.ima', '.IMA', - '.bmp', '.BMP', - '.PIC', '.pic', - '.gipl', '.gipl.gz', - '.jpg', '.JPG', '.jpeg', '.JPEG', - '.lsm', '.LSM', - '.tif', '.TIF', '.tiff', '.TIFF', - '.mnc', '.MNC', - '.mrc', '.rec', - '.mha', '.mhd', - '.hdf', '.h4', '.hdf4', '.he2', '.h5', '.hdf5', '.he5', - '.nia', '.nii', '.nii.gz', '.hdr', '.img', '.img.gz', - '.nrrd', '.nhdr', - '.png', '.PNG', - '.vtk', - '.ome.tiff', '.ome.tif', - '.mrc', '.mrc.gz', '.map', '.map.gz'] - -OME_EXTS = ['.ome.tiff', '.ome.tif', - '.tif', '.TIF', '.tiff', '.TIFF'] - -MRC_EXTS = ['.mrc', '.mrc.gz', '.map', '.map.gz'] - -SEQUENCE_EXTS = ['.bmp', '.BMP', - '.jpg', '.JPG', '.jpeg', '.JPEG', - '.tif', '.TIF', '.tiff', '.TIFF', - '.png', '.PNG'] - -DICOM_EXTS = ['', '.dcm', '.DCM', '.DICOM', '.ima', '.IMA'] - -FH_EXTS = ['', '.dcm', '.DCM', '.DICOM', '.ima', '.IMA', - '.gipl', '.gipl.gz', - '.mnc', '.MNC', - '.mrc', '.rec', - '.mha', '.mhd', - '.nia', '.nii', '.nii.gz', '.hdr', '.img', '.img.gz', - '.hdf', '.h4', '.hdf4', '.he2', '.h5', '.hdf5', '.he5', - '.nrrd', '.nhdr', - '.vtk', - '.gz'] - - -def get_ext(filepath: str) -> str: - file_path = Path(filepath) - if file_path.name.endswith(".nii.gz"): - return ".nii.gz" - elif file_path.name.endswith(".img.gz"): - return ".img.gz" - elif file_path.name.endswith(".gipl.gz"): - return ".gipl.gz" - elif file_path.name.endswith(".ome.tiff"): - return ".ome.tiff" - elif file_path.name.endswith(".ome.tif"): - return ".ome.tif" - elif file_path.name.endswith(".mrc.gz"): - return ".mrc.gz" - elif file_path.name.endswith(".map.gz"): - return ".map.gz" - else: - return file_path.suffix - - -def get_sequence_name(filepath: str) -> str: - ext = get_ext(filepath) - filename = Path(filepath).name.removesuffix(ext) - index: str = get_text_index_str(filename) - return filename.removesuffix(index) - - -def get_sequence_index(filepath: str) -> int: - ext = get_ext(filepath) - filename = Path(filepath).name.removesuffix(ext) - index: str = get_text_index_str(filename) - return int(index) if index else 0 - - -def collect_sequence(filepath: str): - file_path = Path(filepath).resolve() - - files = list(file_path.parent.iterdir()) - file_dict = {} - for file in files: - if file.is_file() \ - and get_ext(file_path) == get_ext(file) \ - and get_sequence_name(file_path) == get_sequence_name(file): - file_dict[get_sequence_index(file)] = file - - for key in file_dict.copy().keys(): - if not file_dict.get(key+1) \ - and not file_dict.get(key-1): - del file_dict[key] - - file_dict = dict(sorted(file_dict.items())) - sequence = [str(f) for f in file_dict.values()] - - if len(sequence) == 0: - sequence = [str(file_path)] - - return sequence - - -def parse_volumetric_data(filepath: str, series_id="", progress_callback=None): - """Parse any volumetric data to numpy with shap (T,X,Y,Z,C) - - Args: - filepath (str): file path - series_id (str, optional): DICOM series id. Defaults to "". - - Returns: - _type_: _description_ - """ - ext = get_ext(filepath) - - if progress_callback: - progressing = progress_callback(0, "Reading the Data...") - if not progressing: - raise CancelledByUser - - is_sequence = False - if ext in SEQUENCE_EXTS: - sequence = collect_sequence(filepath) - if len(sequence) > 1: - is_sequence = True - - volume = None - - # Parsing with mrcfile - if volume is None and ext in MRC_EXTS and not is_sequence: - print("Parsing with mrcfile...") - # TODO: much to do with mrc - with mrcfile.open(filepath) as mrc: - volume = mrc.data - # mrc.print_header() - # print(volume.shape) - # print(mrc.voxel_size) - - if mrc.is_single_image(): - volume = np.expand_dims(volume, axis=0) # expend frame - volume = np.expand_dims(volume, axis=-1) # expend Z - volume = np.expand_dims(volume, axis=-1) # expend channel - - elif mrc.is_image_stack(): - volume = np.expand_dims(volume, axis=-1) # expend Z - volume = np.expand_dims(volume, axis=-1) # expend channel - - elif mrc.is_volume(): - volume = np.expand_dims(volume, axis=0) # expend frame - volume = np.expand_dims(volume, axis=-1) # expend channel - - elif mrc.is_volume_stack(): - volume = np.expand_dims(volume, axis=-1) # expend channel - name = Path(filepath).name.removesuffix(ext).replace(" ", "-") - shape = volume.shape[1:4] - spacing = (mrc.voxel_size.x, mrc.voxel_size.y, mrc.voxel_size.z) - - meta = { - "name": name, - "description": "", - "shape": shape, - "spacing": spacing, - "origin": (0, 0, 0), - "direction": (1, 0, 0, 0, 1, 0, 0, 0, 1), - "frame_count": volume.shape[0], - "channel_count": volume.shape[-1], - "is_oriented": False - } - - # Parsing with OMETIFFReader - if volume is None and ext in OME_EXTS and not is_sequence: - print("Parsing with OMETIFFReader...") - reader = OMETIFFReader(fpath=filepath) - ome_volume, metadata, xml_metadata = reader.read() - - if progress_callback: - progressing = progress_callback(0.5, "Transpose to 'TXYZC'...") - if not progressing: - raise CancelledByUser - - try: - # print(ome_volume.shape) - # for key in metadata: - # print(f"{key},{metadata[key]}") - ome_order = metadata['DimOrder BF Array'] - if ome_volume.ndim == 2: - ome_order = ome_order.replace("T", "")\ - .replace("C", "").replace("Z", "") - bioxel_order = (ome_order.index('X'), - ome_order.index('Y')) - volume = np.transpose(ome_volume, bioxel_order) - volume = np.expand_dims(volume, axis=0) # expend frame - volume = np.expand_dims(volume, axis=-1) # expend Z - volume = np.expand_dims(volume, axis=-1) # expend channel - - elif ome_volume.ndim == 3: - # -> XYZC - ome_order = ome_order.replace("T", "").replace("C", "") - bioxel_order = (ome_order.index('X'), - ome_order.index('Y'), - ome_order.index('Z')) - volume = np.transpose(ome_volume, bioxel_order) - volume = np.expand_dims(volume, axis=0) # expend frame - volume = np.expand_dims(volume, axis=-1) # expend channel - elif ome_volume.ndim == 4: - # -> XYZC - ome_order = ome_order.replace("T", "") - bioxel_order = (ome_order.index('X'), - ome_order.index('Y'), - ome_order.index('Z'), - ome_order.index('C')) - volume = np.transpose(ome_volume, bioxel_order) - volume = np.expand_dims(volume, axis=0) # expend frame - elif ome_volume.ndim == 5: - # -> TXYZC - bioxel_order = (ome_order.index('T'), - ome_order.index('X'), - ome_order.index('Y'), - ome_order.index('Z'), - ome_order.index('C')) - volume = np.transpose(ome_volume, bioxel_order) - - shape = volume.shape[1:4] - - try: - spacing = (metadata['PhysicalSizeX'], - metadata['PhysicalSizeY'], - metadata['PhysicalSizeZ']) - except: - spacing = (1, 1, 1) - - name = Path(filepath).name.removesuffix(ext).replace(" ", "-") - meta = { - "name": name, - "description": "", - "shape": shape, - "spacing": spacing, - "origin": (0, 0, 0), - "direction": (1, 0, 0, 0, 1, 0, 0, 0, 1), - "frame_count": volume.shape[0], - "channel_count": volume.shape[-1], - "is_oriented": False - } - except: - ... - - # Parsing with SimpleITK - if volume is None: - print("Parsing with SimpleITK...") - if ext in DICOM_EXTS: - dir_path = Path(filepath).resolve().parent - reader = sitk.ImageSeriesReader() - reader.MetaDataDictionaryArrayUpdateOn() - reader.LoadPrivateTagsOn() - series_files = reader.GetGDCMSeriesFileNames( - str(dir_path), series_id) - reader.SetFileNames(series_files) - - itk_volume = reader.Execute() - # for k in reader.GetMetaDataKeys(0): - # v = reader.GetMetaData(0, k) - # print(f'({k}) = = "{v}"') - - def get_meta(key): - try: - stirng = reader.GetMetaData(0, key).removesuffix(" ") - if stirng in ["No study description", - "No series description"]: - return None - else: - return stirng - except: - return None - - study_description = get_meta("0008|1030") - series_description = get_meta("0008|103e") - series_modality = get_meta("0008|0060") - - name = study_description or dir_path.name - if series_description and series_modality: - description = f"{series_description}-{series_modality}" - elif series_description: - description = series_description - elif series_modality: - description = series_modality - else: - description = "" - - name = name.replace(" ", "-") - description = description.replace(" ", "-") - - elif ext in SEQUENCE_EXTS and is_sequence: - try: - itk_volume = sitk.ReadImage(sequence) - name = get_sequence_name(filepath).replace(" ", "-") - description = "" - except RuntimeError as e: - raise e - else: - itk_volume = sitk.ReadImage(filepath) - name = Path(filepath).name.removesuffix(ext).replace(" ", "-") - description = "" - - # for key in itk_volume.GetMetaDataKeys(): - # print(f"{key},{itk_volume.GetMetaData(key)}") - - if progress_callback: - progressing = progress_callback(0.5, "Transpose to 'TXYZC'...") - if not progressing: - raise CancelledByUser - - if itk_volume.GetDimension() == 2: - volume = sitk.GetArrayFromImage(itk_volume) - - if volume.ndim == 3: - volume = np.transpose(volume, (1, 0, 2)) - - volume = np.expand_dims(volume, axis=-2) # expend Z - else: - volume = np.transpose(volume) - volume = np.expand_dims(volume, axis=-1) # expend Z - volume = np.expand_dims(volume, axis=-1) # expend channel - - volume = np.expand_dims(volume, axis=0) # expend frame - - meta = { - "name": name, - "description": description, - "shape": volume.shape[1:4], - "spacing": (1, 1, 1), - "origin": (0, 0, 0), - "direction": (1, 0, 0, 0, 1, 0, 0, 0, 1), - "frame_count": 1, - "channel_count": volume.shape[-1], - "is_oriented": False - } - - elif itk_volume.GetDimension() == 3: - itk_volume = sitk.DICOMOrient(itk_volume, 'RAS') - - volume = sitk.GetArrayFromImage(itk_volume) - - # transpose ijk to kji - if volume.ndim == 4: - volume = np.transpose(volume, (2, 1, 0, 3)) - else: - volume = np.transpose(volume) - volume = np.expand_dims(volume, axis=-1) # expend channel - - volume = np.expand_dims(volume, axis=0) # expend frame - - meta = { - "name": name, - "description": description, - "shape": tuple(itk_volume.GetSize()), - "spacing": tuple(itk_volume.GetSpacing()), - "origin": tuple(itk_volume.GetOrigin()), - "direction": tuple(itk_volume.GetDirection()), - "frame_count": 1, - "channel_count": volume.shape[-1], - "is_oriented": True - } - - elif itk_volume.GetDimension() == 4: - # FIXME: not sure... - direction = np.array(itk_volume.GetDirection()) - direction = direction.reshape(3, 3) if itk_volume.GetDimension() == 3 \ - else direction.reshape(4, 4) - - direction = direction[1:, 1:] - direction = tuple(direction.flatten()) - - volume = sitk.GetArrayFromImage(itk_volume) - - if volume.ndim == 5: - volume = np.transpose(volume, (0, 3, 2, 1, 4)) - else: - volume = np.transpose(volume, (0, 3, 2, 1)) - volume = np.expand_dims(volume, axis=-1) - - meta = { - "name": name, - "description": description, - "shape": tuple(itk_volume.GetSize()[:3]), - "spacing": tuple(itk_volume.GetSpacing()[:3]), - "origin": tuple(itk_volume.GetOrigin()[:3]), - "direction": direction, - "frame_count": volume.shape[0], - "channel_count": volume.shape[-1], - "is_oriented": False - } - - return volume, meta diff --git a/bioxelnodes/preferences.py b/bioxelnodes/preferences.py index 24a44b0..754a64d 100644 --- a/bioxelnodes/preferences.py +++ b/bioxelnodes/preferences.py @@ -1,9 +1,7 @@ import bpy from pathlib import Path -from .externalpackage import ExternalPackagePreferences - -class BioxelNodesPreferences(bpy.types.AddonPreferences, ExternalPackagePreferences): +class BioxelNodesPreferences(bpy.types.AddonPreferences): bl_idname = __package__ cache_dir: bpy.props.StringProperty( @@ -20,10 +18,6 @@ class BioxelNodesPreferences(bpy.types.AddonPreferences, ExternalPackagePreferen def draw(self, context): layout = self.layout - # ExternalPackagePreferences Config - self.requirements_dir = str(Path(__file__).parent) - super().draw(context) - layout.label(text="Configuration") layout.prop(self, 'cache_dir') layout.prop(self, "do_change_render_setting") diff --git a/bioxelnodes/scipy/_nd_image.cp311-win_amd64.dll.a b/bioxelnodes/scipy/_nd_image.cp311-win_amd64.dll.a deleted file mode 100644 index 6f540f0..0000000 Binary files a/bioxelnodes/scipy/_nd_image.cp311-win_amd64.dll.a and /dev/null differ diff --git a/bioxelnodes/utils.py b/bioxelnodes/utils.py index e1b0a76..f9ae8ba 100644 --- a/bioxelnodes/utils.py +++ b/bioxelnodes/utils.py @@ -1,19 +1,7 @@ -import bpy -import mathutils from pathlib import Path -import pyopenvdb as vdb -from uuid import uuid4 import shutil -def select_object(target_obj): - for obj in bpy.data.objects: - obj.select_set(False) - - target_obj.select_set(True) - bpy.context.view_layer.objects.active = target_obj - - def copy_to_dir(source_path, dir_path, new_name=None, exist_ok=True): source = Path(source_path) target = Path(dir_path) @@ -42,253 +30,3 @@ def copy_to_dir(source_path, dir_path, new_name=None, exist_ok=True): if not target_path.exists(): raise Exception - - -def move_node_to_node(node, target_node, offset=(0, 0)): - node.location.x = target_node.location.x + offset[0] - node.location.y = target_node.location.y + offset[1] - - -def move_node_between_nodes(node, target_nodes, offset=(0, 0)): - xs = [] - ys = [] - for target_node in target_nodes: - xs.append(target_node.location.x) - ys.append(target_node.location.y) - - node.location.x = sum(xs) / len(xs) + offset[0] - node.location.y = sum(ys) / len(ys) + offset[1] - - -def get_node_type(node): - node_type = type(node).__name__ - if node_type == "GeometryNodeGroup": - node_type = node.node_tree.name - - return node_type - - -def get_nodes_by_type(node_group, type_name: str): - return [node for node in node_group.nodes if get_node_type(node) == type_name] - - -def progress_bar(self, context): - row = self.layout.row() - row.progress( - factor=context.window_manager.bioxelnodes_progress_factor, - type="BAR", - text=context.window_manager.bioxelnodes_progress_text - ) - row.scale_x = 2 - - -def progress_update(context, factor, text=""): - context.window_manager.bioxelnodes_progress_factor = factor - context.window_manager.bioxelnodes_progress_text = text - - -def calc_bbox_verts(origin, size): - bbox_origin = mathutils.Vector( - (origin[0], origin[1], origin[2])) - bbox_size = mathutils.Vector( - (size[0], size[1], size[2])) - bbox_verts = [ - ( - bbox_origin[0] + 0, - bbox_origin[1] + 0, - bbox_origin[2] + 0 - ), - ( - bbox_origin[0] + 0, - bbox_origin[1] + 0, - bbox_origin[2] + bbox_size[2] - ), - ( - bbox_origin[0] + 0, - bbox_origin[1] + bbox_size[1], - bbox_origin[2] + 0 - ), - ( - bbox_origin[0] + 0, - bbox_origin[1] + bbox_size[1], - bbox_origin[2] + bbox_size[2] - ), - ( - bbox_origin[0] + bbox_size[0], - bbox_origin[1] + 0, - bbox_origin[2] + 0 - ), - ( - bbox_origin[0] + bbox_size[0], - bbox_origin[1] + 0, - bbox_origin[2] + bbox_size[2], - ), - ( - bbox_origin[0] + bbox_size[0], - bbox_origin[1] + bbox_size[1], - bbox_origin[2] + 0, - ), - ( - bbox_origin[0] + bbox_size[0], - bbox_origin[1] + bbox_size[1], - bbox_origin[2] + bbox_size[2], - ), - ] - return bbox_verts - - -def lock_transform(obj): - obj.lock_location[0] = True - obj.lock_location[1] = True - obj.lock_location[2] = True - obj.lock_rotation[0] = True - obj.lock_rotation[1] = True - obj.lock_rotation[2] = True - obj.lock_scale[0] = True - obj.lock_scale[1] = True - obj.lock_scale[2] = True - - -def hide_in_ray(obj): - obj.visible_camera = False - obj.visible_diffuse = False - obj.visible_glossy = False - obj.visible_transmission = False - obj.visible_volume_scatter = False - obj.visible_shadow = False - - -def save_vdb(grids, context): - preferences = context.preferences.addons[__package__].preferences - cache_dir = Path(preferences.cache_dir, 'VDBs') - cache_dir.mkdir(parents=True, exist_ok=True) - - vdb_path = Path(cache_dir, f"{uuid4()}.vdb") - # print(f"Storing the VDB file ({str(vdb_path)})...") - vdb.write(str(vdb_path), grids=grids) - - return vdb_path - - -def save_vdbs(grids_sequence, context): - preferences = context.preferences.addons[__package__].preferences - cache_dir = Path(preferences.cache_dir, 'VDBs') - cache_dir.mkdir(parents=True, exist_ok=True) - vdb_name = str(uuid4()) - vdb_dir_path = Path(cache_dir, vdb_name) - vdb_dir_path.mkdir(parents=True, exist_ok=True) - - vdb_paths = [] - for f, grids in enumerate(grids_sequence): - vdb_path = Path(vdb_dir_path, f"{vdb_name}.{str(f+1).zfill(4)}.vdb") - # print(f"Storing the VDB file ({str(vdb_path)})...") - vdb.write(str(vdb_path), grids=grids) - vdb_paths.append(vdb_path) - - return vdb_paths - - -def get_container_from_selection(): - containers = [] - for obj in bpy.context.selected_objects: - if get_container(obj): - containers.append(obj) - # if bpy.context.active_object: - # if bpy.context.active_object.get('bioxel_layer'): - # if bpy.context.active_object.parent.get('bioxel_container'): - # containers.append(bpy.context.active_object.parent) - - return list(set(containers)) - - -def get_container(current_obj): - if current_obj: - if current_obj.get('bioxel_container'): - return current_obj - elif current_obj.get('bioxel_layer'): - parent = current_obj.parent - return parent if parent.get('bioxel_container') else None - return None - - -def get_layer(current_obj): - if current_obj: - if current_obj.get('bioxel_layer') and current_obj.parent: - if current_obj.parent.get('bioxel_container'): - return current_obj - return None - - -def get_container_layers(container): - layers = [] - for obj in bpy.data.objects: - if obj.parent == container and get_layer(obj): - layers.append(obj) - - return layers - - -def get_all_layers(): - layers = [] - for obj in bpy.data.objects: - if get_layer(obj): - layers.append(obj) - - return layers - - -def get_text_index_str(text): - # Initialize an empty string to store the digits - digits = "" - - # Iterate through the characters in reverse order - started = False - for char in text[::-1]: - if char.isdigit(): - started = True - # If the character is a digit, add it to the digits string - digits += char - else: - if started: - # If a non-digit character is encountered, stop the loop - break - - # Reverse the digits string to get the correct order - last_number = digits[::-1] - - return last_number - - -def add_driver(target_prop, var_sources, expression): - - driver = target_prop.driver_add("default_value") - is_vector = isinstance(driver, list) - drivers = driver if is_vector else [driver] - - for i, driver in enumerate(drivers): - for j, var_source in enumerate(var_sources): - - source = var_source['source'] - prop = var_source['prop'] - - var = driver.driver.variables.new() - var.name = f"var{j}" - - var.targets[0].id_type = source.id_type - var.targets[0].id = source - var.targets[0].data_path = f'["{prop}"][{i}]'\ - if is_vector else f'["{prop}"]' - - driver.driver.expression = expression - - -def add_direct_driver(target, target_prop, source, source_prop): - target_prop = target.inputs.get(target_prop) - drivers = [ - { - "source": source, - "prop": source_prop - } - ] - expression = "var0" - add_driver(target_prop, drivers, expression) diff --git a/build.py b/build.py new file mode 100644 index 0000000..44e50d6 --- /dev/null +++ b/build.py @@ -0,0 +1,86 @@ +from pathlib import Path +import shutil +import subprocess +import sys +from dataclasses import dataclass +import tomlkit + + +@dataclass +class Platform: + pypi_suffix: str + blender_tag: str + + +required_packages = ["SimpleITK==2.3.1", + "pyometiff==1.0.0", + "mrcfile==1.5.1", + "h5py==3.11.0", + "transforms3d==0.4.2"] + + +platforms = {"windows-x64": Platform(pypi_suffix="win_amd64", + blender_tag="windows-x64"), + "linux-x64": Platform(pypi_suffix="manylinux2014_x86_64", + blender_tag="linux-x64"), + "macos-arm64": Platform(pypi_suffix="macosx_12_0_arm64", + blender_tag="macos-arm64"), + "macos-x64": Platform(pypi_suffix="macosx_10_16_x86_64", + blender_tag="macos-x64")} + +packages_to_remove = { + "imagecodecs", + "numpy" +} + + +def run_python(args: str): + python = Path(sys.executable).resolve() + subprocess.run([python] + args.split(" ")) + + +def build_extension(platform: Platform, python_version="3.11") -> None: + wheel_dirpath = Path("./bioxelnodes/wheels") + toml_filepath = Path("bioxelnodes/blender_manifest.toml") + scipy_ndimage_dirpath = Path("./scipy_ndimage", platform.blender_tag) + + # download required_packages + run_python( + f"-m pip download {' '.join(required_packages)} --dest {wheel_dirpath.as_posix()} --only-binary=:all: --python-version={python_version} --platform={platform.pypi_suffix}" + ) + + for f in wheel_dirpath.glob('*.whl'): + if any([package in f.name for package in packages_to_remove]): + f.unlink(missing_ok=True) + + for ndimage_filepath in scipy_ndimage_dirpath.iterdir(): + to_filepath = Path("./bioxelnodes/bioxel/scipy", ndimage_filepath.name) + shutil.copy(ndimage_filepath, to_filepath) + + # Load the TOML file + with toml_filepath.open("r") as file: + manifest = tomlkit.parse(file.read()) + + build = tomlkit.table(True) + generated = tomlkit.table() + generated["platforms"] = [platform.blender_tag] + generated["wheels"] = [f"./wheels/{f.name}" + for f in wheel_dirpath.glob('*.whl')] + + build.append('generated', generated) + manifest.append('build', build) + + # Write the updated TOML file + with toml_filepath.open("w") as file: + text = tomlkit.dumps(manifest) + file.write(text) + + +def main(): + platform_name = sys.argv[1] + platform = platforms[platform_name] + build_extension(platform) + + +if __name__ == "__main__": + main() diff --git a/docs/index.md b/docs/index.md index df46319..7a49539 100644 --- a/docs/index.md +++ b/docs/index.md @@ -13,7 +13,7 @@ Bioxel Nodes is a Blender addon for scientific volumetric data visualization. It ![cover](https://omoolab.github.io/BioxelNodes/latest/assets/cover.png) -- Fantastic rendering result, also support EEVEE NEXT. +- Realistic rendering result, also support EEVEE NEXT. - Support multiple formats. - Support 4D volumetric data. - All kinds of cutters. @@ -41,13 +41,13 @@ Welcome to our [discord server](https://discord.gg/pYkNyq2TjE), if you have any ## Support 4D volumetric data -![4d](assets/4d-time.gif) +![4d](https://omoolab.github.io/BioxelNodes/latest/assets/4d-time.gif) 🥰 4D volumetric data can also be imported into Blender. ## Support EEVEE NEXT -![eevee](assets/eevee.gif) +![eevee](https://omoolab.github.io/BioxelNodes/latest/assets/eevee.gif) 👍 EEVEE NEXT is absolutely AWESOME! Bioxel Nodes is fully support EEVEE NEXT now! However, there are some limitations: @@ -61,13 +61,13 @@ Welcome to our [discord server](https://discord.gg/pYkNyq2TjE), if you have any ## Compatible to Newer Version -**Updating this addon may break old files, so read the following carefully before updating** +**v0.3.x is not compatible to v0.2.x, Updating this addon may break old files. Read the following carefully before upgradation** -Before updating this addon, you need to ask yourself whether this project file will be modified again or not, if it's an archived project file, I would recommend that you run **Bioxel Nodes > Save Staged Data** to make the addon nodes permanent. In this way, there will be no potential problem with the nodes not functioning due to the addon update. +Before upgradation, you need to ask yourself whether this project file will be modified again or not, if it's an archived project file, I would recommend that you run **Bioxel Nodes > Save Staged Data** to make the addon nodes permanent. In this way, there will be no potential problem with the nodes not functioning due to the addon update. After the addon update, your old project files may not work either, this may be because you had executed **Save Staged Data**. If so, you need to execute **Bioxel Nodes > Relink Nodes to Addon** to relink them to make sure that the addon's new functionality and the addon nodes are synchronized. -Also, unlike the newer versions, the older shaders are not based on OSL, so if you find that you can't render volumes, you need to turn on **Open Shading Language (OSL)** in the Render Settings. +Also, the older shaders are not based on OSL, so if you find that you can't render volumes, you need to turn on **Open Shading Language (OSL)** in the Render Settings. ## Roadmap diff --git a/extension/__init__.py b/extension/__init__.py deleted file mode 100644 index 6e3ec9f..0000000 --- a/extension/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -import bpy - -from . import auto_load -from . import menus - - -auto_load.init() - - -def register(): - auto_load.register() - bpy.types.WindowManager.bioxelnodes_progress_factor = bpy.props.FloatProperty() - bpy.types.WindowManager.bioxelnodes_progress_text = bpy.props.StringProperty() - menus.add() - - -def unregister(): - menus.remove() - auto_load.unregister() diff --git a/extension/blender_manifest.toml b/extension/blender_manifest.toml deleted file mode 100644 index 348fbae..0000000 --- a/extension/blender_manifest.toml +++ /dev/null @@ -1,73 +0,0 @@ -schema_version = "1.0.0" - -# Example of manifest file for a Blender extension -# Change the values according to your extension -id = "bioxelnodes" -version = "0.2.9" -name = "Bioxel Nodes" -tagline = "For scientific volumetric data visualization in Blender" -maintainer = "Ma Nan " -# Supported types: "add-on", "theme" -type = "add-on" - -# Optional link to documentation, support, source files, etc -website = "https://omoolab.github.io/BioxelNodes/latest" - -# Optional list defined by Blender and server, see: -# https://docs.blender.org/manual/en/dev/advanced/extensions/tags.html -tags = ["Geometry Nodes", "Render", "Import-Export"] - -blender_version_min = "4.2.0" -# Optional: maximum supported Blender version -# blender_version_max = "5.1.0" - -# License conforming to https://spdx.org/licenses/ (use "SPDX: prefix) -# https://docs.blender.org/manual/en/dev/advanced/extensions/licenses.html -license = [ - "SPDX:MIT", -] -# Optional: required by some licenses. -copyright = [ - "2024 OmooLab" -] - -# Optional list of supported platforms. If omitted, the extension will be available in all operating systems. -platforms = ["windows-x64"] -# Other supported platforms: "windows-arm64", "macos-x64" - -# Optional: bundle 3rd party Python modules. -# https://docs.blender.org/manual/en/dev/advanced/extensions/python_wheels.html -wheels = [ - "./wheels/SimpleITK-2.3.1-cp311-cp311-win_amd64.whl", - "./wheels/lxml-5.2.2-cp311-cp311-win_amd64.whl", - "./wheels/tifffile-2024.7.21-py3-none-any.whl", - "./wheels/pyometiff-1.0.0-py3-none-any.whl", - "./wheels/mrcfile-1.5.1-py2.py3-none-any.whl" -] - - -## Optional: add-ons can list which resources they will require: -## * files (for access of any filesystem operations) -## * network (for internet access) -## * clipboard (to read and/or write the system clipboard) -## * camera (to capture photos and videos) -## * microphone (to capture audio) -## -## If using network, remember to also check `bpy.app.online_access` -## https://docs.blender.org/manual/en/dev/advanced/extensions/addons.html#internet-access -## -## For each permission it is important to also specify the reason why it is required. -## Keep this a single short sentence without a period (.) at the end. -## For longer explanations use the documentation or detail page. -# -[permissions] -files = "Import/export volume data from/to disk" - -# Optional: build settings. -# https://docs.blender.org/manual/en/dev/advanced/extensions/command_line_arguments.html#command-line-args-extension-build -# [build] -# paths_exclude_pattern = [ -# "__pycache__/", -# "/.git/", -# "/*.zip", -# ] \ No newline at end of file diff --git a/extension/preferences.py b/extension/preferences.py deleted file mode 100644 index 754a64d..0000000 --- a/extension/preferences.py +++ /dev/null @@ -1,23 +0,0 @@ -import bpy -from pathlib import Path - -class BioxelNodesPreferences(bpy.types.AddonPreferences): - bl_idname = __package__ - - cache_dir: bpy.props.StringProperty( - name="Set Cache Directory", - subtype='DIR_PATH', - default=str(Path(Path.home(), '.bioxelnodes')) - ) # type: ignore - - do_change_render_setting: bpy.props.BoolProperty( - name="Change Render Setting", - default=True, - ) # type: ignore - - def draw(self, context): - layout = self.layout - - layout.label(text="Configuration") - layout.prop(self, 'cache_dir') - layout.prop(self, "do_change_render_setting") diff --git a/poetry.lock b/poetry.lock index 779500f..e2c88ca 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,48 +1,18 @@ # This file is automatically @generated by Poetry 1.8.0 and should not be changed by hand. -[[package]] -name = "appnope" -version = "0.1.4" -description = "Disable App Nap on macOS >= 10.9" -optional = false -python-versions = ">=3.6" -files = [ - {file = "appnope-0.1.4-py2.py3-none-any.whl", hash = "sha256:502575ee11cd7a28c0205f379b525beefebab9d161b7c964670864014ed7213c"}, - {file = "appnope-0.1.4.tar.gz", hash = "sha256:1de3860566df9caf38f01f86f65e0e13e379af54f9e4bee1e66b48f2efffd1ee"}, -] - -[[package]] -name = "asttokens" -version = "2.4.1" -description = "Annotate AST trees with source code positions" -optional = false -python-versions = "*" -files = [ - {file = "asttokens-2.4.1-py2.py3-none-any.whl", hash = "sha256:051ed49c3dcae8913ea7cd08e46a606dba30b79993209636c4875bc1d637bc24"}, - {file = "asttokens-2.4.1.tar.gz", hash = "sha256:b03869718ba9a6eb027e134bfdf69f38a236d681c83c160d510768af11254ba0"}, -] - -[package.dependencies] -six = ">=1.12.0" - -[package.extras] -astroid = ["astroid (>=1,<2)", "astroid (>=2,<4)"] -test = ["astroid (>=1,<2)", "astroid (>=2,<4)", "pytest"] - [[package]] name = "autopep8" -version = "2.1.0" +version = "2.3.1" description = "A tool that automatically formats Python code to conform to the PEP 8 style guide" optional = false python-versions = ">=3.8" files = [ - {file = "autopep8-2.1.0-py2.py3-none-any.whl", hash = "sha256:2bb76888c5edbcafe6aabab3c47ba534f5a2c2d245c2eddced4a30c4b4946357"}, - {file = "autopep8-2.1.0.tar.gz", hash = "sha256:1fa8964e4618929488f4ec36795c7ff12924a68b8bf01366c094fc52f770b6e7"}, + {file = "autopep8-2.3.1-py2.py3-none-any.whl", hash = "sha256:a203fe0fcad7939987422140ab17a930f684763bf7335bdb6709991dd7ef6c2d"}, + {file = "autopep8-2.3.1.tar.gz", hash = "sha256:8d6c87eba648fdcfc83e29b788910b8643171c395d9c4bcf115ece035b9c9dda"}, ] [package.dependencies] -pycodestyle = ">=2.11.0" -tomli = {version = "*", markers = "python_version < \"3.11\""} +pycodestyle = ">=2.12.0" [[package]] name = "babel" @@ -60,15 +30,15 @@ dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] [[package]] name = "bpy" -version = "4.0.0" +version = "4.2.0" description = "Blender as a Python module" optional = false -python-versions = "==3.10.*" +python-versions = "==3.11.*" files = [ - {file = "bpy-4.0.0-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:fb3f0d8c2ffb4dfa26d9cb31ccd59b9cc7336d5bc3b6b8f067642b191785cf10"}, - {file = "bpy-4.0.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:97dce1885b04296c3d27ddfde3e078acdc3ccf455983bbf46c681f966b61612a"}, - {file = "bpy-4.0.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:d6caceb7598232df42dcaa13433c6fee91ea811c67a3e32816643840f97c30cf"}, - {file = "bpy-4.0.0-cp310-cp310-win_amd64.whl", hash = "sha256:57e66dcf1a99e0bdbb8fbaad52e6c922b9454e3b9a06ce698852ab66bc6a31b1"}, + {file = "bpy-4.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e6e8857c9f483d42f5388642601080ad3e7488970cbc9e59efeedf4a8c26c90b"}, + {file = "bpy-4.2.0-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:4fd0e9872dceb37209d298ccbe77e6c3d0421501ef71b464dde22d09607966ec"}, + {file = "bpy-4.2.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:a8217c2bd7b3424d1f51ce0698c0bf65439de352f7f6ed7b9942e2a9e5eb121b"}, + {file = "bpy-4.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:26ce6210deb8316816938cb1c62c7fd257a8ef38d0c20b9f031a7a47a1492cac"}, ] [package.dependencies] @@ -79,13 +49,13 @@ zstandard = "*" [[package]] name = "certifi" -version = "2024.2.2" +version = "2024.7.4" description = "Python package for providing Mozilla's CA Bundle." optional = false python-versions = ">=3.6" files = [ - {file = "certifi-2024.2.2-py3-none-any.whl", hash = "sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1"}, - {file = "certifi-2024.2.2.tar.gz", hash = "sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f"}, + {file = "certifi-2024.7.4-py3-none-any.whl", hash = "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"}, + {file = "certifi-2024.7.4.tar.gz", hash = "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b"}, ] [[package]] @@ -276,87 +246,67 @@ files = [ {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, ] -[[package]] -name = "comm" -version = "0.2.2" -description = "Jupyter Python Comm implementation, for usage in ipykernel, xeus-python etc." -optional = false -python-versions = ">=3.8" -files = [ - {file = "comm-0.2.2-py3-none-any.whl", hash = "sha256:e6fb86cb70ff661ee8c9c14e7d36d6de3b4066f1441be4063df9c5009f0a64d3"}, - {file = "comm-0.2.2.tar.gz", hash = "sha256:3fd7a84065306e07bea1773df6eb8282de51ba82f77c72f9c85716ab11fe980e"}, -] - -[package.dependencies] -traitlets = ">=4" - -[package.extras] -test = ["pytest"] - [[package]] name = "coverage" -version = "7.5.1" +version = "7.6.0" description = "Code coverage measurement for Python" optional = false python-versions = ">=3.8" files = [ - {file = "coverage-7.5.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c0884920835a033b78d1c73b6d3bbcda8161a900f38a488829a83982925f6c2e"}, - {file = "coverage-7.5.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:39afcd3d4339329c5f58de48a52f6e4e50f6578dd6099961cf22228feb25f38f"}, - {file = "coverage-7.5.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4a7b0ceee8147444347da6a66be737c9d78f3353b0681715b668b72e79203e4a"}, - {file = "coverage-7.5.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4a9ca3f2fae0088c3c71d743d85404cec8df9be818a005ea065495bedc33da35"}, - {file = "coverage-7.5.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5fd215c0c7d7aab005221608a3c2b46f58c0285a819565887ee0b718c052aa4e"}, - {file = "coverage-7.5.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4bf0655ab60d754491004a5efd7f9cccefcc1081a74c9ef2da4735d6ee4a6223"}, - {file = "coverage-7.5.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:61c4bf1ba021817de12b813338c9be9f0ad5b1e781b9b340a6d29fc13e7c1b5e"}, - {file = "coverage-7.5.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:db66fc317a046556a96b453a58eced5024af4582a8dbdc0c23ca4dbc0d5b3146"}, - {file = "coverage-7.5.1-cp310-cp310-win32.whl", hash = "sha256:b016ea6b959d3b9556cb401c55a37547135a587db0115635a443b2ce8f1c7228"}, - {file = "coverage-7.5.1-cp310-cp310-win_amd64.whl", hash = "sha256:df4e745a81c110e7446b1cc8131bf986157770fa405fe90e15e850aaf7619bc8"}, - {file = "coverage-7.5.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:796a79f63eca8814ca3317a1ea443645c9ff0d18b188de470ed7ccd45ae79428"}, - {file = "coverage-7.5.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4fc84a37bfd98db31beae3c2748811a3fa72bf2007ff7902f68746d9757f3746"}, - {file = "coverage-7.5.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6175d1a0559986c6ee3f7fccfc4a90ecd12ba0a383dcc2da30c2b9918d67d8a3"}, - {file = "coverage-7.5.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1fc81d5878cd6274ce971e0a3a18a8803c3fe25457165314271cf78e3aae3aa2"}, - {file = "coverage-7.5.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:556cf1a7cbc8028cb60e1ff0be806be2eded2daf8129b8811c63e2b9a6c43bca"}, - {file = "coverage-7.5.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:9981706d300c18d8b220995ad22627647be11a4276721c10911e0e9fa44c83e8"}, - {file = "coverage-7.5.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:d7fed867ee50edf1a0b4a11e8e5d0895150e572af1cd6d315d557758bfa9c057"}, - {file = "coverage-7.5.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ef48e2707fb320c8f139424a596f5b69955a85b178f15af261bab871873bb987"}, - {file = "coverage-7.5.1-cp311-cp311-win32.whl", hash = "sha256:9314d5678dcc665330df5b69c1e726a0e49b27df0461c08ca12674bcc19ef136"}, - {file = "coverage-7.5.1-cp311-cp311-win_amd64.whl", hash = "sha256:5fa567e99765fe98f4e7d7394ce623e794d7cabb170f2ca2ac5a4174437e90dd"}, - {file = "coverage-7.5.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:b6cf3764c030e5338e7f61f95bd21147963cf6aa16e09d2f74f1fa52013c1206"}, - {file = "coverage-7.5.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2ec92012fefebee89a6b9c79bc39051a6cb3891d562b9270ab10ecfdadbc0c34"}, - {file = "coverage-7.5.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:16db7f26000a07efcf6aea00316f6ac57e7d9a96501e990a36f40c965ec7a95d"}, - {file = "coverage-7.5.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:beccf7b8a10b09c4ae543582c1319c6df47d78fd732f854ac68d518ee1fb97fa"}, - {file = "coverage-7.5.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8748731ad392d736cc9ccac03c9845b13bb07d020a33423fa5b3a36521ac6e4e"}, - {file = "coverage-7.5.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:7352b9161b33fd0b643ccd1f21f3a3908daaddf414f1c6cb9d3a2fd618bf2572"}, - {file = "coverage-7.5.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:7a588d39e0925f6a2bff87154752481273cdb1736270642aeb3635cb9b4cad07"}, - {file = "coverage-7.5.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:68f962d9b72ce69ea8621f57551b2fa9c70509af757ee3b8105d4f51b92b41a7"}, - {file = "coverage-7.5.1-cp312-cp312-win32.whl", hash = "sha256:f152cbf5b88aaeb836127d920dd0f5e7edff5a66f10c079157306c4343d86c19"}, - {file = "coverage-7.5.1-cp312-cp312-win_amd64.whl", hash = "sha256:5a5740d1fb60ddf268a3811bcd353de34eb56dc24e8f52a7f05ee513b2d4f596"}, - {file = "coverage-7.5.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e2213def81a50519d7cc56ed643c9e93e0247f5bbe0d1247d15fa520814a7cd7"}, - {file = "coverage-7.5.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:5037f8fcc2a95b1f0e80585bd9d1ec31068a9bcb157d9750a172836e98bc7a90"}, - {file = "coverage-7.5.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5c3721c2c9e4c4953a41a26c14f4cef64330392a6d2d675c8b1db3b645e31f0e"}, - {file = "coverage-7.5.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ca498687ca46a62ae590253fba634a1fe9836bc56f626852fb2720f334c9e4e5"}, - {file = "coverage-7.5.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0cdcbc320b14c3e5877ee79e649677cb7d89ef588852e9583e6b24c2e5072661"}, - {file = "coverage-7.5.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:57e0204b5b745594e5bc14b9b50006da722827f0b8c776949f1135677e88d0b8"}, - {file = "coverage-7.5.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8fe7502616b67b234482c3ce276ff26f39ffe88adca2acf0261df4b8454668b4"}, - {file = "coverage-7.5.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:9e78295f4144f9dacfed4f92935fbe1780021247c2fabf73a819b17f0ccfff8d"}, - {file = "coverage-7.5.1-cp38-cp38-win32.whl", hash = "sha256:1434e088b41594baa71188a17533083eabf5609e8e72f16ce8c186001e6b8c41"}, - {file = "coverage-7.5.1-cp38-cp38-win_amd64.whl", hash = "sha256:0646599e9b139988b63704d704af8e8df7fa4cbc4a1f33df69d97f36cb0a38de"}, - {file = "coverage-7.5.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4cc37def103a2725bc672f84bd939a6fe4522310503207aae4d56351644682f1"}, - {file = "coverage-7.5.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fc0b4d8bfeabd25ea75e94632f5b6e047eef8adaed0c2161ada1e922e7f7cece"}, - {file = "coverage-7.5.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0d0a0f5e06881ecedfe6f3dd2f56dcb057b6dbeb3327fd32d4b12854df36bf26"}, - {file = "coverage-7.5.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9735317685ba6ec7e3754798c8871c2f49aa5e687cc794a0b1d284b2389d1bd5"}, - {file = "coverage-7.5.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d21918e9ef11edf36764b93101e2ae8cc82aa5efdc7c5a4e9c6c35a48496d601"}, - {file = "coverage-7.5.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c3e757949f268364b96ca894b4c342b41dc6f8f8b66c37878aacef5930db61be"}, - {file = "coverage-7.5.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:79afb6197e2f7f60c4824dd4b2d4c2ec5801ceb6ba9ce5d2c3080e5660d51a4f"}, - {file = "coverage-7.5.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d1d0d98d95dd18fe29dc66808e1accf59f037d5716f86a501fc0256455219668"}, - {file = "coverage-7.5.1-cp39-cp39-win32.whl", hash = "sha256:1cc0fe9b0b3a8364093c53b0b4c0c2dd4bb23acbec4c9240b5f284095ccf7981"}, - {file = "coverage-7.5.1-cp39-cp39-win_amd64.whl", hash = "sha256:dde0070c40ea8bb3641e811c1cfbf18e265d024deff6de52c5950677a8fb1e0f"}, - {file = "coverage-7.5.1-pp38.pp39.pp310-none-any.whl", hash = "sha256:6537e7c10cc47c595828b8a8be04c72144725c383c4702703ff4e42e44577312"}, - {file = "coverage-7.5.1.tar.gz", hash = "sha256:54de9ef3a9da981f7af93eafde4ede199e0846cd819eb27c88e2b712aae9708c"}, + {file = "coverage-7.6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:dff044f661f59dace805eedb4a7404c573b6ff0cdba4a524141bc63d7be5c7fd"}, + {file = "coverage-7.6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a8659fd33ee9e6ca03950cfdcdf271d645cf681609153f218826dd9805ab585c"}, + {file = "coverage-7.6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7792f0ab20df8071d669d929c75c97fecfa6bcab82c10ee4adb91c7a54055463"}, + {file = "coverage-7.6.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d4b3cd1ca7cd73d229487fa5caca9e4bc1f0bca96526b922d61053ea751fe791"}, + {file = "coverage-7.6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e7e128f85c0b419907d1f38e616c4f1e9f1d1b37a7949f44df9a73d5da5cd53c"}, + {file = "coverage-7.6.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:a94925102c89247530ae1dab7dc02c690942566f22e189cbd53579b0693c0783"}, + {file = "coverage-7.6.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:dcd070b5b585b50e6617e8972f3fbbee786afca71b1936ac06257f7e178f00f6"}, + {file = "coverage-7.6.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:d50a252b23b9b4dfeefc1f663c568a221092cbaded20a05a11665d0dbec9b8fb"}, + {file = "coverage-7.6.0-cp310-cp310-win32.whl", hash = "sha256:0e7b27d04131c46e6894f23a4ae186a6a2207209a05df5b6ad4caee6d54a222c"}, + {file = "coverage-7.6.0-cp310-cp310-win_amd64.whl", hash = "sha256:54dece71673b3187c86226c3ca793c5f891f9fc3d8aa183f2e3653da18566169"}, + {file = "coverage-7.6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c7b525ab52ce18c57ae232ba6f7010297a87ced82a2383b1afd238849c1ff933"}, + {file = "coverage-7.6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4bea27c4269234e06f621f3fac3925f56ff34bc14521484b8f66a580aacc2e7d"}, + {file = "coverage-7.6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ed8d1d1821ba5fc88d4a4f45387b65de52382fa3ef1f0115a4f7a20cdfab0e94"}, + {file = "coverage-7.6.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:01c322ef2bbe15057bc4bf132b525b7e3f7206f071799eb8aa6ad1940bcf5fb1"}, + {file = "coverage-7.6.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:03cafe82c1b32b770a29fd6de923625ccac3185a54a5e66606da26d105f37dac"}, + {file = "coverage-7.6.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:0d1b923fc4a40c5832be4f35a5dab0e5ff89cddf83bb4174499e02ea089daf57"}, + {file = "coverage-7.6.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:4b03741e70fb811d1a9a1d75355cf391f274ed85847f4b78e35459899f57af4d"}, + {file = "coverage-7.6.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a73d18625f6a8a1cbb11eadc1d03929f9510f4131879288e3f7922097a429f63"}, + {file = "coverage-7.6.0-cp311-cp311-win32.whl", hash = "sha256:65fa405b837060db569a61ec368b74688f429b32fa47a8929a7a2f9b47183713"}, + {file = "coverage-7.6.0-cp311-cp311-win_amd64.whl", hash = "sha256:6379688fb4cfa921ae349c76eb1a9ab26b65f32b03d46bb0eed841fd4cb6afb1"}, + {file = "coverage-7.6.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:f7db0b6ae1f96ae41afe626095149ecd1b212b424626175a6633c2999eaad45b"}, + {file = "coverage-7.6.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:bbdf9a72403110a3bdae77948b8011f644571311c2fb35ee15f0f10a8fc082e8"}, + {file = "coverage-7.6.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9cc44bf0315268e253bf563f3560e6c004efe38f76db03a1558274a6e04bf5d5"}, + {file = "coverage-7.6.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:da8549d17489cd52f85a9829d0e1d91059359b3c54a26f28bec2c5d369524807"}, + {file = "coverage-7.6.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0086cd4fc71b7d485ac93ca4239c8f75732c2ae3ba83f6be1c9be59d9e2c6382"}, + {file = "coverage-7.6.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:1fad32ee9b27350687035cb5fdf9145bc9cf0a094a9577d43e909948ebcfa27b"}, + {file = "coverage-7.6.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:044a0985a4f25b335882b0966625270a8d9db3d3409ddc49a4eb00b0ef5e8cee"}, + {file = "coverage-7.6.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:76d5f82213aa78098b9b964ea89de4617e70e0d43e97900c2778a50856dac605"}, + {file = "coverage-7.6.0-cp312-cp312-win32.whl", hash = "sha256:3c59105f8d58ce500f348c5b56163a4113a440dad6daa2294b5052a10db866da"}, + {file = "coverage-7.6.0-cp312-cp312-win_amd64.whl", hash = "sha256:ca5d79cfdae420a1d52bf177de4bc2289c321d6c961ae321503b2ca59c17ae67"}, + {file = "coverage-7.6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d39bd10f0ae453554798b125d2f39884290c480f56e8a02ba7a6ed552005243b"}, + {file = "coverage-7.6.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:beb08e8508e53a568811016e59f3234d29c2583f6b6e28572f0954a6b4f7e03d"}, + {file = "coverage-7.6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b2e16f4cd2bc4d88ba30ca2d3bbf2f21f00f382cf4e1ce3b1ddc96c634bc48ca"}, + {file = "coverage-7.6.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6616d1c9bf1e3faea78711ee42a8b972367d82ceae233ec0ac61cc7fec09fa6b"}, + {file = "coverage-7.6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ad4567d6c334c46046d1c4c20024de2a1c3abc626817ae21ae3da600f5779b44"}, + {file = "coverage-7.6.0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:d17c6a415d68cfe1091d3296ba5749d3d8696e42c37fca5d4860c5bf7b729f03"}, + {file = "coverage-7.6.0-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:9146579352d7b5f6412735d0f203bbd8d00113a680b66565e205bc605ef81bc6"}, + {file = "coverage-7.6.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:cdab02a0a941af190df8782aafc591ef3ad08824f97850b015c8c6a8b3877b0b"}, + {file = "coverage-7.6.0-cp38-cp38-win32.whl", hash = "sha256:df423f351b162a702c053d5dddc0fc0ef9a9e27ea3f449781ace5f906b664428"}, + {file = "coverage-7.6.0-cp38-cp38-win_amd64.whl", hash = "sha256:f2501d60d7497fd55e391f423f965bbe9e650e9ffc3c627d5f0ac516026000b8"}, + {file = "coverage-7.6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7221f9ac9dad9492cecab6f676b3eaf9185141539d5c9689d13fd6b0d7de840c"}, + {file = "coverage-7.6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ddaaa91bfc4477d2871442bbf30a125e8fe6b05da8a0015507bfbf4718228ab2"}, + {file = "coverage-7.6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4cbe651f3904e28f3a55d6f371203049034b4ddbce65a54527a3f189ca3b390"}, + {file = "coverage-7.6.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:831b476d79408ab6ccfadaaf199906c833f02fdb32c9ab907b1d4aa0713cfa3b"}, + {file = "coverage-7.6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:46c3d091059ad0b9c59d1034de74a7f36dcfa7f6d3bde782c49deb42438f2450"}, + {file = "coverage-7.6.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:4d5fae0a22dc86259dee66f2cc6c1d3e490c4a1214d7daa2a93d07491c5c04b6"}, + {file = "coverage-7.6.0-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:07ed352205574aad067482e53dd606926afebcb5590653121063fbf4e2175166"}, + {file = "coverage-7.6.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:49c76cdfa13015c4560702574bad67f0e15ca5a2872c6a125f6327ead2b731dd"}, + {file = "coverage-7.6.0-cp39-cp39-win32.whl", hash = "sha256:482855914928c8175735a2a59c8dc5806cf7d8f032e4820d52e845d1f731dca2"}, + {file = "coverage-7.6.0-cp39-cp39-win_amd64.whl", hash = "sha256:543ef9179bc55edfd895154a51792b01c017c87af0ebaae092720152e19e42ca"}, + {file = "coverage-7.6.0-pp38.pp39.pp310-none-any.whl", hash = "sha256:6fe885135c8a479d3e37a7aae61cbd3a0fb2deccb4dda3c25f92a49189f766d6"}, + {file = "coverage-7.6.0.tar.gz", hash = "sha256:289cc803fa1dc901f84701ac10c9ee873619320f2f9aff38794db4a4a0268d51"}, ] -[package.dependencies] -tomli = {version = "*", optional = true, markers = "python_full_version <= \"3.11.0a6\" and extra == \"toml\""} - [package.extras] toml = ["tomli"] @@ -427,76 +377,6 @@ files = [ {file = "Cython-3.0.10.tar.gz", hash = "sha256:dcc96739331fb854dcf503f94607576cfe8488066c61ca50dfd55836f132de99"}, ] -[[package]] -name = "debugpy" -version = "1.8.1" -description = "An implementation of the Debug Adapter Protocol for Python" -optional = false -python-versions = ">=3.8" -files = [ - {file = "debugpy-1.8.1-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:3bda0f1e943d386cc7a0e71bfa59f4137909e2ed947fb3946c506e113000f741"}, - {file = "debugpy-1.8.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dda73bf69ea479c8577a0448f8c707691152e6c4de7f0c4dec5a4bc11dee516e"}, - {file = "debugpy-1.8.1-cp310-cp310-win32.whl", hash = "sha256:3a79c6f62adef994b2dbe9fc2cc9cc3864a23575b6e387339ab739873bea53d0"}, - {file = "debugpy-1.8.1-cp310-cp310-win_amd64.whl", hash = "sha256:7eb7bd2b56ea3bedb009616d9e2f64aab8fc7000d481faec3cd26c98a964bcdd"}, - {file = "debugpy-1.8.1-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:016a9fcfc2c6b57f939673c874310d8581d51a0fe0858e7fac4e240c5eb743cb"}, - {file = "debugpy-1.8.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fd97ed11a4c7f6d042d320ce03d83b20c3fb40da892f994bc041bbc415d7a099"}, - {file = "debugpy-1.8.1-cp311-cp311-win32.whl", hash = "sha256:0de56aba8249c28a300bdb0672a9b94785074eb82eb672db66c8144fff673146"}, - {file = "debugpy-1.8.1-cp311-cp311-win_amd64.whl", hash = "sha256:1a9fe0829c2b854757b4fd0a338d93bc17249a3bf69ecf765c61d4c522bb92a8"}, - {file = "debugpy-1.8.1-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:3ebb70ba1a6524d19fa7bb122f44b74170c447d5746a503e36adc244a20ac539"}, - {file = "debugpy-1.8.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a2e658a9630f27534e63922ebf655a6ab60c370f4d2fc5c02a5b19baf4410ace"}, - {file = "debugpy-1.8.1-cp312-cp312-win32.whl", hash = "sha256:caad2846e21188797a1f17fc09c31b84c7c3c23baf2516fed5b40b378515bbf0"}, - {file = "debugpy-1.8.1-cp312-cp312-win_amd64.whl", hash = "sha256:edcc9f58ec0fd121a25bc950d4578df47428d72e1a0d66c07403b04eb93bcf98"}, - {file = "debugpy-1.8.1-cp38-cp38-macosx_11_0_x86_64.whl", hash = "sha256:7a3afa222f6fd3d9dfecd52729bc2e12c93e22a7491405a0ecbf9e1d32d45b39"}, - {file = "debugpy-1.8.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d915a18f0597ef685e88bb35e5d7ab968964b7befefe1aaea1eb5b2640b586c7"}, - {file = "debugpy-1.8.1-cp38-cp38-win32.whl", hash = "sha256:92116039b5500633cc8d44ecc187abe2dfa9b90f7a82bbf81d079fcdd506bae9"}, - {file = "debugpy-1.8.1-cp38-cp38-win_amd64.whl", hash = "sha256:e38beb7992b5afd9d5244e96ad5fa9135e94993b0c551ceebf3fe1a5d9beb234"}, - {file = "debugpy-1.8.1-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:bfb20cb57486c8e4793d41996652e5a6a885b4d9175dd369045dad59eaacea42"}, - {file = "debugpy-1.8.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:efd3fdd3f67a7e576dd869c184c5dd71d9aaa36ded271939da352880c012e703"}, - {file = "debugpy-1.8.1-cp39-cp39-win32.whl", hash = "sha256:58911e8521ca0c785ac7a0539f1e77e0ce2df753f786188f382229278b4cdf23"}, - {file = "debugpy-1.8.1-cp39-cp39-win_amd64.whl", hash = "sha256:6df9aa9599eb05ca179fb0b810282255202a66835c6efb1d112d21ecb830ddd3"}, - {file = "debugpy-1.8.1-py2.py3-none-any.whl", hash = "sha256:28acbe2241222b87e255260c76741e1fbf04fdc3b6d094fcf57b6c6f75ce1242"}, - {file = "debugpy-1.8.1.zip", hash = "sha256:f696d6be15be87aef621917585f9bb94b1dc9e8aced570db1b8a6fc14e8f9b42"}, -] - -[[package]] -name = "decorator" -version = "5.1.1" -description = "Decorators for Humans" -optional = false -python-versions = ">=3.5" -files = [ - {file = "decorator-5.1.1-py3-none-any.whl", hash = "sha256:b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186"}, - {file = "decorator-5.1.1.tar.gz", hash = "sha256:637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330"}, -] - -[[package]] -name = "exceptiongroup" -version = "1.2.1" -description = "Backport of PEP 654 (exception groups)" -optional = false -python-versions = ">=3.7" -files = [ - {file = "exceptiongroup-1.2.1-py3-none-any.whl", hash = "sha256:5258b9ed329c5bbdd31a309f53cbfb0b155341807f6ff7606a1e801a891b29ad"}, - {file = "exceptiongroup-1.2.1.tar.gz", hash = "sha256:a4785e48b045528f5bfe627b6ad554ff32def154f42372786903b7abcfe1aa16"}, -] - -[package.extras] -test = ["pytest (>=6)"] - -[[package]] -name = "executing" -version = "2.0.1" -description = "Get the currently executing AST node of a frame, and other information" -optional = false -python-versions = ">=3.5" -files = [ - {file = "executing-2.0.1-py2.py3-none-any.whl", hash = "sha256:eac49ca94516ccc753f9fb5ce82603156e590b27525a8bc32cce8ae302eb61bc"}, - {file = "executing-2.0.1.tar.gz", hash = "sha256:35afe2ce3affba8ee97f2d69927fa823b08b472b7b994e36a52a964b93d16147"}, -] - -[package.extras] -tests = ["asttokens (>=2.1.0)", "coverage", "coverage-enable-subprocess", "ipython", "littleutils", "pytest", "rich"] - [[package]] name = "ghp-import" version = "2.1.0" @@ -515,18 +395,37 @@ python-dateutil = ">=2.8.1" dev = ["flake8", "markdown", "twine", "wheel"] [[package]] -name = "griffe" -version = "0.45.0" -description = "Signatures for entire Python programs. Extract the structure, the frame, the skeleton of your project, to generate API documentation or find breaking changes in your API." +name = "h5py" +version = "3.11.0" +description = "Read and write HDF5 files from Python" optional = false python-versions = ">=3.8" files = [ - {file = "griffe-0.45.0-py3-none-any.whl", hash = "sha256:90fe5c90e1b0ca7dd6fee78f9009f4e01b37dbc9ab484a9b2c1578915db1e571"}, - {file = "griffe-0.45.0.tar.gz", hash = "sha256:85cb2868d026ea51c89bdd589ad3ccc94abc5bd8d5d948e3d4450778a2a05b4a"}, + {file = "h5py-3.11.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:1625fd24ad6cfc9c1ccd44a66dac2396e7ee74940776792772819fc69f3a3731"}, + {file = "h5py-3.11.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c072655ad1d5fe9ef462445d3e77a8166cbfa5e599045f8aa3c19b75315f10e5"}, + {file = "h5py-3.11.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77b19a40788e3e362b54af4dcf9e6fde59ca016db2c61360aa30b47c7b7cef00"}, + {file = "h5py-3.11.0-cp310-cp310-win_amd64.whl", hash = "sha256:ef4e2f338fc763f50a8113890f455e1a70acd42a4d083370ceb80c463d803972"}, + {file = "h5py-3.11.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:bbd732a08187a9e2a6ecf9e8af713f1d68256ee0f7c8b652a32795670fb481ba"}, + {file = "h5py-3.11.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:75bd7b3d93fbeee40860fd70cdc88df4464e06b70a5ad9ce1446f5f32eb84007"}, + {file = "h5py-3.11.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:52c416f8eb0daae39dabe71415cb531f95dce2d81e1f61a74537a50c63b28ab3"}, + {file = "h5py-3.11.0-cp311-cp311-win_amd64.whl", hash = "sha256:083e0329ae534a264940d6513f47f5ada617da536d8dccbafc3026aefc33c90e"}, + {file = "h5py-3.11.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:a76cae64080210389a571c7d13c94a1a6cf8cb75153044fd1f822a962c97aeab"}, + {file = "h5py-3.11.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f3736fe21da2b7d8a13fe8fe415f1272d2a1ccdeff4849c1421d2fb30fd533bc"}, + {file = "h5py-3.11.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aa6ae84a14103e8dc19266ef4c3e5d7c00b68f21d07f2966f0ca7bdb6c2761fb"}, + {file = "h5py-3.11.0-cp312-cp312-win_amd64.whl", hash = "sha256:21dbdc5343f53b2e25404673c4f00a3335aef25521bd5fa8c707ec3833934892"}, + {file = "h5py-3.11.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:754c0c2e373d13d6309f408325343b642eb0f40f1a6ad21779cfa9502209e150"}, + {file = "h5py-3.11.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:731839240c59ba219d4cb3bc5880d438248533366f102402cfa0621b71796b62"}, + {file = "h5py-3.11.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8ec9df3dd2018904c4cc06331951e274f3f3fd091e6d6cc350aaa90fa9b42a76"}, + {file = "h5py-3.11.0-cp38-cp38-win_amd64.whl", hash = "sha256:55106b04e2c83dfb73dc8732e9abad69d83a436b5b82b773481d95d17b9685e1"}, + {file = "h5py-3.11.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f4e025e852754ca833401777c25888acb96889ee2c27e7e629a19aee288833f0"}, + {file = "h5py-3.11.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:6c4b760082626120031d7902cd983d8c1f424cdba2809f1067511ef283629d4b"}, + {file = "h5py-3.11.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:67462d0669f8f5459529de179f7771bd697389fcb3faab54d63bf788599a48ea"}, + {file = "h5py-3.11.0-cp39-cp39-win_amd64.whl", hash = "sha256:d9c944d364688f827dc889cf83f1fca311caf4fa50b19f009d1f2b525edd33a3"}, + {file = "h5py-3.11.0.tar.gz", hash = "sha256:7b7e8f78072a2edec87c9836f25f34203fd492a4475709a18b417a33cfb21fa9"}, ] [package.dependencies] -colorama = ">=0.4" +numpy = ">=1.17.3" [[package]] name = "idna" @@ -582,56 +481,24 @@ numpy = "*" [package.extras] all = ["matplotlib", "numcodecs", "tifffile"] -[[package]] -name = "imageio" -version = "2.34.2" -description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats." -optional = false -python-versions = ">=3.8" -files = [ - {file = "imageio-2.34.2-py3-none-any.whl", hash = "sha256:a0bb27ec9d5bab36a9f4835e51b21d2cb099e1f78451441f94687ff3404b79f8"}, - {file = "imageio-2.34.2.tar.gz", hash = "sha256:5c0c0ee8faa018a1c42f649b90395dd4d3bb6187c09053a0cd6f1fdd51bbff5e"}, -] - -[package.dependencies] -numpy = "*" -pillow = ">=8.3.2" - -[package.extras] -all-plugins = ["astropy", "av", "imageio-ffmpeg", "pillow-heif", "psutil", "tifffile"] -all-plugins-pypy = ["av", "imageio-ffmpeg", "pillow-heif", "psutil", "tifffile"] -build = ["wheel"] -dev = ["black", "flake8", "fsspec[github]", "pytest", "pytest-cov"] -docs = ["numpydoc", "pydata-sphinx-theme", "sphinx (<6)"] -ffmpeg = ["imageio-ffmpeg", "psutil"] -fits = ["astropy"] -full = ["astropy", "av", "black", "flake8", "fsspec[github]", "gdal", "imageio-ffmpeg", "itk", "numpydoc", "pillow-heif", "psutil", "pydata-sphinx-theme", "pytest", "pytest-cov", "sphinx (<6)", "tifffile", "wheel"] -gdal = ["gdal"] -itk = ["itk"] -linting = ["black", "flake8"] -pillow-heif = ["pillow-heif"] -pyav = ["av"] -test = ["fsspec[github]", "pytest", "pytest-cov"] -tifffile = ["tifffile"] - [[package]] name = "importlib-metadata" -version = "7.1.0" +version = "8.2.0" description = "Read metadata from Python packages" optional = false python-versions = ">=3.8" files = [ - {file = "importlib_metadata-7.1.0-py3-none-any.whl", hash = "sha256:30962b96c0c223483ed6cc7280e7f0199feb01a0e40cfae4d4450fc6fab1f570"}, - {file = "importlib_metadata-7.1.0.tar.gz", hash = "sha256:b78938b926ee8d5f020fc4772d487045805a55ddbad2ecf21c6d60938dc7fcd2"}, + {file = "importlib_metadata-8.2.0-py3-none-any.whl", hash = "sha256:11901fa0c2f97919b288679932bb64febaeacf289d18ac84dd68cb2e74213369"}, + {file = "importlib_metadata-8.2.0.tar.gz", hash = "sha256:72e8d4399996132204f9a16dcc751af254a48f8d1b20b9ff0f98d4a8f901e73d"}, ] [package.dependencies] zipp = ">=0.5" [package.extras] -docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] perf = ["ipython"] -testing = ["flufl.flake8", "importlib-resources (>=1.3)", "jaraco.test (>=5.4)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy", "pytest-perf (>=0.9.2)", "pytest-ruff (>=0.2.1)"] +test = ["flufl.flake8", "importlib-resources (>=1.3)", "jaraco.test (>=5.4)", "packaging", "pyfakefs", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy", "pytest-perf (>=0.9.2)", "pytest-ruff (>=0.2.1)"] [[package]] name = "importlib-resources" @@ -659,96 +526,6 @@ files = [ {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"}, ] -[[package]] -name = "ipykernel" -version = "6.29.4" -description = "IPython Kernel for Jupyter" -optional = false -python-versions = ">=3.8" -files = [ - {file = "ipykernel-6.29.4-py3-none-any.whl", hash = "sha256:1181e653d95c6808039c509ef8e67c4126b3b3af7781496c7cbfb5ed938a27da"}, - {file = "ipykernel-6.29.4.tar.gz", hash = "sha256:3d44070060f9475ac2092b760123fadf105d2e2493c24848b6691a7c4f42af5c"}, -] - -[package.dependencies] -appnope = {version = "*", markers = "platform_system == \"Darwin\""} -comm = ">=0.1.1" -debugpy = ">=1.6.5" -ipython = ">=7.23.1" -jupyter-client = ">=6.1.12" -jupyter-core = ">=4.12,<5.0.dev0 || >=5.1.dev0" -matplotlib-inline = ">=0.1" -nest-asyncio = "*" -packaging = "*" -psutil = "*" -pyzmq = ">=24" -tornado = ">=6.1" -traitlets = ">=5.4.0" - -[package.extras] -cov = ["coverage[toml]", "curio", "matplotlib", "pytest-cov", "trio"] -docs = ["myst-parser", "pydata-sphinx-theme", "sphinx", "sphinx-autodoc-typehints", "sphinxcontrib-github-alt", "sphinxcontrib-spelling", "trio"] -pyqt5 = ["pyqt5"] -pyside6 = ["pyside6"] -test = ["flaky", "ipyparallel", "pre-commit", "pytest (>=7.0)", "pytest-asyncio (>=0.23.5)", "pytest-cov", "pytest-timeout"] - -[[package]] -name = "ipython" -version = "8.24.0" -description = "IPython: Productive Interactive Computing" -optional = false -python-versions = ">=3.10" -files = [ - {file = "ipython-8.24.0-py3-none-any.whl", hash = "sha256:d7bf2f6c4314984e3e02393213bab8703cf163ede39672ce5918c51fe253a2a3"}, - {file = "ipython-8.24.0.tar.gz", hash = "sha256:010db3f8a728a578bb641fdd06c063b9fb8e96a9464c63aec6310fbcb5e80501"}, -] - -[package.dependencies] -colorama = {version = "*", markers = "sys_platform == \"win32\""} -decorator = "*" -exceptiongroup = {version = "*", markers = "python_version < \"3.11\""} -jedi = ">=0.16" -matplotlib-inline = "*" -pexpect = {version = ">4.3", markers = "sys_platform != \"win32\" and sys_platform != \"emscripten\""} -prompt-toolkit = ">=3.0.41,<3.1.0" -pygments = ">=2.4.0" -stack-data = "*" -traitlets = ">=5.13.0" -typing-extensions = {version = ">=4.6", markers = "python_version < \"3.12\""} - -[package.extras] -all = ["ipython[black,doc,kernel,matplotlib,nbconvert,nbformat,notebook,parallel,qtconsole]", "ipython[test,test-extra]"] -black = ["black"] -doc = ["docrepr", "exceptiongroup", "ipykernel", "ipython[test]", "matplotlib", "setuptools (>=18.5)", "sphinx (>=1.3)", "sphinx-rtd-theme", "sphinxcontrib-jquery", "stack-data", "typing-extensions"] -kernel = ["ipykernel"] -matplotlib = ["matplotlib"] -nbconvert = ["nbconvert"] -nbformat = ["nbformat"] -notebook = ["ipywidgets", "notebook"] -parallel = ["ipyparallel"] -qtconsole = ["qtconsole"] -test = ["pickleshare", "pytest", "pytest-asyncio (<0.22)", "testpath"] -test-extra = ["curio", "ipython[test]", "matplotlib (!=3.2.0)", "nbformat", "numpy (>=1.23)", "pandas", "trio"] - -[[package]] -name = "jedi" -version = "0.19.1" -description = "An autocompletion tool for Python that can be used for text editors." -optional = false -python-versions = ">=3.6" -files = [ - {file = "jedi-0.19.1-py2.py3-none-any.whl", hash = "sha256:e983c654fe5c02867aef4cdfce5a2fbb4a50adc0af145f70504238f18ef5e7e0"}, - {file = "jedi-0.19.1.tar.gz", hash = "sha256:cf0496f3651bc65d7174ac1b7d043eff454892c708a87d1b683e57b569927ffd"}, -] - -[package.dependencies] -parso = ">=0.8.3,<0.9.0" - -[package.extras] -docs = ["Jinja2 (==2.11.3)", "MarkupSafe (==1.1.1)", "Pygments (==2.8.1)", "alabaster (==0.7.12)", "babel (==2.9.1)", "chardet (==4.0.0)", "commonmark (==0.8.1)", "docutils (==0.17.1)", "future (==0.18.2)", "idna (==2.10)", "imagesize (==1.2.0)", "mock (==1.0.1)", "packaging (==20.9)", "pyparsing (==2.4.7)", "pytz (==2021.1)", "readthedocs-sphinx-ext (==2.1.4)", "recommonmark (==0.5.0)", "requests (==2.25.1)", "six (==1.15.0)", "snowballstemmer (==2.1.0)", "sphinx (==1.8.5)", "sphinx-rtd-theme (==0.4.3)", "sphinxcontrib-serializinghtml (==1.1.4)", "sphinxcontrib-websupport (==1.2.4)", "urllib3 (==1.26.4)"] -qa = ["flake8 (==5.0.4)", "mypy (==0.971)", "types-setuptools (==67.2.0.1)"] -testing = ["Django", "attrs", "colorama", "docopt", "pytest (<7.0.0)"] - [[package]] name = "jinja2" version = "3.1.4" @@ -766,67 +543,6 @@ MarkupSafe = ">=2.0" [package.extras] i18n = ["Babel (>=2.7)"] -[[package]] -name = "jupyter-client" -version = "8.6.1" -description = "Jupyter protocol implementation and client libraries" -optional = false -python-versions = ">=3.8" -files = [ - {file = "jupyter_client-8.6.1-py3-none-any.whl", hash = "sha256:3b7bd22f058434e3b9a7ea4b1500ed47de2713872288c0d511d19926f99b459f"}, - {file = "jupyter_client-8.6.1.tar.gz", hash = "sha256:e842515e2bab8e19186d89fdfea7abd15e39dd581f94e399f00e2af5a1652d3f"}, -] - -[package.dependencies] -jupyter-core = ">=4.12,<5.0.dev0 || >=5.1.dev0" -python-dateutil = ">=2.8.2" -pyzmq = ">=23.0" -tornado = ">=6.2" -traitlets = ">=5.3" - -[package.extras] -docs = ["ipykernel", "myst-parser", "pydata-sphinx-theme", "sphinx (>=4)", "sphinx-autodoc-typehints", "sphinxcontrib-github-alt", "sphinxcontrib-spelling"] -test = ["coverage", "ipykernel (>=6.14)", "mypy", "paramiko", "pre-commit", "pytest", "pytest-cov", "pytest-jupyter[client] (>=0.4.1)", "pytest-timeout"] - -[[package]] -name = "jupyter-core" -version = "5.7.2" -description = "Jupyter core package. A base package on which Jupyter projects rely." -optional = false -python-versions = ">=3.8" -files = [ - {file = "jupyter_core-5.7.2-py3-none-any.whl", hash = "sha256:4f7315d2f6b4bcf2e3e7cb6e46772eba760ae459cd1f59d29eb57b0a01bd7409"}, - {file = "jupyter_core-5.7.2.tar.gz", hash = "sha256:aa5f8d32bbf6b431ac830496da7392035d6f61b4f54872f15c4bd2a9c3f536d9"}, -] - -[package.dependencies] -platformdirs = ">=2.5" -pywin32 = {version = ">=300", markers = "sys_platform == \"win32\" and platform_python_implementation != \"PyPy\""} -traitlets = ">=5.3" - -[package.extras] -docs = ["myst-parser", "pydata-sphinx-theme", "sphinx-autodoc-typehints", "sphinxcontrib-github-alt", "sphinxcontrib-spelling", "traitlets"] -test = ["ipykernel", "pre-commit", "pytest (<8)", "pytest-cov", "pytest-timeout"] - -[[package]] -name = "lazy-loader" -version = "0.4" -description = "Makes it easy to load subpackages and functions on demand." -optional = false -python-versions = ">=3.7" -files = [ - {file = "lazy_loader-0.4-py3-none-any.whl", hash = "sha256:342aa8e14d543a154047afb4ba8ef17f5563baad3fc610d7b15b213b0f119efc"}, - {file = "lazy_loader-0.4.tar.gz", hash = "sha256:47c75182589b91a4e1a85a136c074285a5ad4d9f39c63e0d7fb76391c4574cd1"}, -] - -[package.dependencies] -packaging = "*" - -[package.extras] -dev = ["changelist (==0.5)"] -lint = ["pre-commit (==3.7.0)"] -test = ["pytest (>=7.4)", "pytest-cov (>=4.1)"] - [[package]] name = "lxml" version = "5.2.2" @@ -1069,20 +785,6 @@ files = [ {file = "MarkupSafe-2.1.5.tar.gz", hash = "sha256:d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b"}, ] -[[package]] -name = "matplotlib-inline" -version = "0.1.7" -description = "Inline Matplotlib backend for Jupyter" -optional = false -python-versions = ">=3.8" -files = [ - {file = "matplotlib_inline-0.1.7-py3-none-any.whl", hash = "sha256:df192d39a4ff8f21b1895d72e6a13f5fcc5099f00fa84384e0ea28c2cc0653ca"}, - {file = "matplotlib_inline-0.1.7.tar.gz", hash = "sha256:8423b23ec666be3d16e16b60bdd8ac4e86e840ebd1dd11a30b9f117f2fa0ab90"}, -] - -[package.dependencies] -traitlets = "*" - [[package]] name = "mergedeep" version = "1.3.4" @@ -1096,13 +798,13 @@ files = [ [[package]] name = "mike" -version = "2.1.1" +version = "2.1.2" description = "Manage multiple versions of your MkDocs-powered documentation" optional = false python-versions = "*" files = [ - {file = "mike-2.1.1-py3-none-any.whl", hash = "sha256:0b1d01a397a423284593eeb1b5f3194e37169488f929b860c9bfe95c0d5efb79"}, - {file = "mike-2.1.1.tar.gz", hash = "sha256:f39ed39f3737da83ad0adc33e9f885092ed27f8c9e7ff0523add0480352a2c22"}, + {file = "mike-2.1.2-py3-none-any.whl", hash = "sha256:d61d9b423ab412d634ca2bd520136d5114e3cc73f4bbd1aa6a0c6625c04918c0"}, + {file = "mike-2.1.2.tar.gz", hash = "sha256:d59cc8054c50f9c8a046cfd47f9b700cf9ff1b2b19f420bd8812ca6f94fa8bd3"}, ] [package.dependencies] @@ -1149,37 +851,6 @@ watchdog = ">=2.0" i18n = ["babel (>=2.9.0)"] min-versions = ["babel (==2.9.0)", "click (==7.0)", "colorama (==0.4)", "ghp-import (==1.0)", "importlib-metadata (==4.4)", "jinja2 (==2.11.1)", "markdown (==3.3.6)", "markupsafe (==2.0.1)", "mergedeep (==1.3.4)", "mkdocs-get-deps (==0.2.0)", "packaging (==20.5)", "pathspec (==0.11.1)", "pyyaml (==5.1)", "pyyaml-env-tag (==0.1)", "watchdog (==2.0)"] -[[package]] -name = "mkdocs-autorefs" -version = "1.0.1" -description = "Automatically link across pages in MkDocs." -optional = false -python-versions = ">=3.8" -files = [ - {file = "mkdocs_autorefs-1.0.1-py3-none-any.whl", hash = "sha256:aacdfae1ab197780fb7a2dac92ad8a3d8f7ca8049a9cbe56a4218cd52e8da570"}, - {file = "mkdocs_autorefs-1.0.1.tar.gz", hash = "sha256:f684edf847eced40b570b57846b15f0bf57fb93ac2c510450775dcf16accb971"}, -] - -[package.dependencies] -Markdown = ">=3.3" -markupsafe = ">=2.0.1" -mkdocs = ">=1.1" - -[[package]] -name = "mkdocs-click" -version = "0.8.1" -description = "An MkDocs extension to generate documentation for Click command line applications" -optional = false -python-versions = ">=3.7" -files = [ - {file = "mkdocs_click-0.8.1-py3-none-any.whl", hash = "sha256:a100ff938be63911f86465a1c21d29a669a7c51932b700fdb3daa90d13b61ee4"}, - {file = "mkdocs_click-0.8.1.tar.gz", hash = "sha256:0a88cce04870c5d70ff63138e2418219c3c4119cc928a59c66b76eb5214edba6"}, -] - -[package.dependencies] -click = ">=8.1" -markdown = ">=3.3" - [[package]] name = "mkdocs-get-deps" version = "0.2.0" @@ -1198,13 +869,13 @@ pyyaml = ">=5.1" [[package]] name = "mkdocs-material" -version = "9.5.22" +version = "9.5.30" description = "Documentation that simply works" optional = false python-versions = ">=3.8" files = [ - {file = "mkdocs_material-9.5.22-py3-none-any.whl", hash = "sha256:8c7a377d323567934e6cd46915e64dc209efceaec0dec1cf2202184f5649862c"}, - {file = "mkdocs_material-9.5.22.tar.gz", hash = "sha256:22a853a456ae8c581c4628159574d6fc7c71b2c7569dc9c3a82cc70432219599"}, + {file = "mkdocs_material-9.5.30-py3-none-any.whl", hash = "sha256:fc070689c5250a180e9b9d79d8491ef9a3a7acb240db0728728d6c31eeb131d4"}, + {file = "mkdocs_material-9.5.30.tar.gz", hash = "sha256:3fd417dd42d679e3ba08b9e2d72cd8b8af142cc4a3969676ad6b00993dd182ec"}, ] [package.dependencies] @@ -1236,46 +907,6 @@ files = [ {file = "mkdocs_material_extensions-1.3.1.tar.gz", hash = "sha256:10c9511cea88f568257f960358a467d12b970e1f7b2c0e5fb2bb48cab1928443"}, ] -[[package]] -name = "mkdocstrings" -version = "0.23.0" -description = "Automatic documentation from sources, for MkDocs." -optional = false -python-versions = ">=3.8" -files = [ - {file = "mkdocstrings-0.23.0-py3-none-any.whl", hash = "sha256:051fa4014dfcd9ed90254ae91de2dbb4f24e166347dae7be9a997fe16316c65e"}, - {file = "mkdocstrings-0.23.0.tar.gz", hash = "sha256:d9c6a37ffbe7c14a7a54ef1258c70b8d394e6a33a1c80832bce40b9567138d1c"}, -] - -[package.dependencies] -Jinja2 = ">=2.11.1" -Markdown = ">=3.3" -MarkupSafe = ">=1.1" -mkdocs = ">=1.2" -mkdocs-autorefs = ">=0.3.1" -mkdocstrings-python = {version = ">=0.5.2", optional = true, markers = "extra == \"python\""} -pymdown-extensions = ">=6.3" - -[package.extras] -crystal = ["mkdocstrings-crystal (>=0.3.4)"] -python = ["mkdocstrings-python (>=0.5.2)"] -python-legacy = ["mkdocstrings-python-legacy (>=0.2.1)"] - -[[package]] -name = "mkdocstrings-python" -version = "1.8.0" -description = "A Python handler for mkdocstrings." -optional = false -python-versions = ">=3.8" -files = [ - {file = "mkdocstrings_python-1.8.0-py3-none-any.whl", hash = "sha256:4209970cc90bec194568682a535848a8d8489516c6ed4adbe58bbc67b699ca9d"}, - {file = "mkdocstrings_python-1.8.0.tar.gz", hash = "sha256:1488bddf50ee42c07d9a488dddc197f8e8999c2899687043ec5dd1643d057192"}, -] - -[package.dependencies] -griffe = ">=0.37" -mkdocstrings = ">=0.20" - [[package]] name = "mrcfile" version = "1.5.1" @@ -1290,89 +921,69 @@ files = [ [package.dependencies] numpy = ">=1.16.0" -[[package]] -name = "nest-asyncio" -version = "1.6.0" -description = "Patch asyncio to allow nested event loops" -optional = false -python-versions = ">=3.5" -files = [ - {file = "nest_asyncio-1.6.0-py3-none-any.whl", hash = "sha256:87af6efd6b5e897c81050477ef65c62e2b2f35d51703cae01aff2905b1852e1c"}, - {file = "nest_asyncio-1.6.0.tar.gz", hash = "sha256:6f172d5449aca15afd6c646851f4e31e02c598d553a667e38cafa997cfec55fe"}, -] - -[[package]] -name = "networkx" -version = "3.3" -description = "Python package for creating and manipulating graphs and networks" -optional = false -python-versions = ">=3.10" -files = [ - {file = "networkx-3.3-py3-none-any.whl", hash = "sha256:28575580c6ebdaf4505b22c6256a2b9de86b316dc63ba9e93abde3d78dfdbcf2"}, - {file = "networkx-3.3.tar.gz", hash = "sha256:0c127d8b2f4865f59ae9cb8aafcd60b5c70f3241ebd66f7defad7c4ab90126c9"}, -] - -[package.extras] -default = ["matplotlib (>=3.6)", "numpy (>=1.23)", "pandas (>=1.4)", "scipy (>=1.9,!=1.11.0,!=1.11.1)"] -developer = ["changelist (==0.5)", "mypy (>=1.1)", "pre-commit (>=3.2)", "rtoml"] -doc = ["myst-nb (>=1.0)", "numpydoc (>=1.7)", "pillow (>=9.4)", "pydata-sphinx-theme (>=0.14)", "sphinx (>=7)", "sphinx-gallery (>=0.14)", "texext (>=0.6.7)"] -extra = ["lxml (>=4.6)", "pydot (>=2.0)", "pygraphviz (>=1.12)", "sympy (>=1.10)"] -test = ["pytest (>=7.2)", "pytest-cov (>=4.0)"] - [[package]] name = "numpy" -version = "1.26.4" +version = "2.0.1" description = "Fundamental package for array computing in Python" optional = false python-versions = ">=3.9" files = [ - {file = "numpy-1.26.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9ff0f4f29c51e2803569d7a51c2304de5554655a60c5d776e35b4a41413830d0"}, - {file = "numpy-1.26.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2e4ee3380d6de9c9ec04745830fd9e2eccb3e6cf790d39d7b98ffd19b0dd754a"}, - {file = "numpy-1.26.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d209d8969599b27ad20994c8e41936ee0964e6da07478d6c35016bc386b66ad4"}, - {file = "numpy-1.26.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ffa75af20b44f8dba823498024771d5ac50620e6915abac414251bd971b4529f"}, - {file = "numpy-1.26.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:62b8e4b1e28009ef2846b4c7852046736bab361f7aeadeb6a5b89ebec3c7055a"}, - {file = "numpy-1.26.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:a4abb4f9001ad2858e7ac189089c42178fcce737e4169dc61321660f1a96c7d2"}, - {file = "numpy-1.26.4-cp310-cp310-win32.whl", hash = "sha256:bfe25acf8b437eb2a8b2d49d443800a5f18508cd811fea3181723922a8a82b07"}, - {file = "numpy-1.26.4-cp310-cp310-win_amd64.whl", hash = "sha256:b97fe8060236edf3662adfc2c633f56a08ae30560c56310562cb4f95500022d5"}, - {file = "numpy-1.26.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4c66707fabe114439db9068ee468c26bbdf909cac0fb58686a42a24de1760c71"}, - {file = "numpy-1.26.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:edd8b5fe47dab091176d21bb6de568acdd906d1887a4584a15a9a96a1dca06ef"}, - {file = "numpy-1.26.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7ab55401287bfec946ced39700c053796e7cc0e3acbef09993a9ad2adba6ca6e"}, - {file = "numpy-1.26.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:666dbfb6ec68962c033a450943ded891bed2d54e6755e35e5835d63f4f6931d5"}, - {file = "numpy-1.26.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:96ff0b2ad353d8f990b63294c8986f1ec3cb19d749234014f4e7eb0112ceba5a"}, - {file = "numpy-1.26.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:60dedbb91afcbfdc9bc0b1f3f402804070deed7392c23eb7a7f07fa857868e8a"}, - {file = "numpy-1.26.4-cp311-cp311-win32.whl", hash = "sha256:1af303d6b2210eb850fcf03064d364652b7120803a0b872f5211f5234b399f20"}, - {file = "numpy-1.26.4-cp311-cp311-win_amd64.whl", hash = "sha256:cd25bcecc4974d09257ffcd1f098ee778f7834c3ad767fe5db785be9a4aa9cb2"}, - {file = "numpy-1.26.4-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:b3ce300f3644fb06443ee2222c2201dd3a89ea6040541412b8fa189341847218"}, - {file = "numpy-1.26.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:03a8c78d01d9781b28a6989f6fa1bb2c4f2d51201cf99d3dd875df6fbd96b23b"}, - {file = "numpy-1.26.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9fad7dcb1aac3c7f0584a5a8133e3a43eeb2fe127f47e3632d43d677c66c102b"}, - {file = "numpy-1.26.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:675d61ffbfa78604709862923189bad94014bef562cc35cf61d3a07bba02a7ed"}, - {file = "numpy-1.26.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:ab47dbe5cc8210f55aa58e4805fe224dac469cde56b9f731a4c098b91917159a"}, - {file = "numpy-1.26.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:1dda2e7b4ec9dd512f84935c5f126c8bd8b9f2fc001e9f54af255e8c5f16b0e0"}, - {file = "numpy-1.26.4-cp312-cp312-win32.whl", hash = "sha256:50193e430acfc1346175fcbdaa28ffec49947a06918b7b92130744e81e640110"}, - {file = "numpy-1.26.4-cp312-cp312-win_amd64.whl", hash = "sha256:08beddf13648eb95f8d867350f6a018a4be2e5ad54c8d8caed89ebca558b2818"}, - {file = "numpy-1.26.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7349ab0fa0c429c82442a27a9673fc802ffdb7c7775fad780226cb234965e53c"}, - {file = "numpy-1.26.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:52b8b60467cd7dd1e9ed082188b4e6bb35aa5cdd01777621a1658910745b90be"}, - {file = "numpy-1.26.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d5241e0a80d808d70546c697135da2c613f30e28251ff8307eb72ba696945764"}, - {file = "numpy-1.26.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f870204a840a60da0b12273ef34f7051e98c3b5961b61b0c2c1be6dfd64fbcd3"}, - {file = "numpy-1.26.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:679b0076f67ecc0138fd2ede3a8fd196dddc2ad3254069bcb9faf9a79b1cebcd"}, - {file = "numpy-1.26.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:47711010ad8555514b434df65f7d7b076bb8261df1ca9bb78f53d3b2db02e95c"}, - {file = "numpy-1.26.4-cp39-cp39-win32.whl", hash = "sha256:a354325ee03388678242a4d7ebcd08b5c727033fcff3b2f536aea978e15ee9e6"}, - {file = "numpy-1.26.4-cp39-cp39-win_amd64.whl", hash = "sha256:3373d5d70a5fe74a2c1bb6d2cfd9609ecf686d47a2d7b1d37a8f3b6bf6003aea"}, - {file = "numpy-1.26.4-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:afedb719a9dcfc7eaf2287b839d8198e06dcd4cb5d276a3df279231138e83d30"}, - {file = "numpy-1.26.4-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95a7476c59002f2f6c590b9b7b998306fba6a5aa646b1e22ddfeaf8f78c3a29c"}, - {file = "numpy-1.26.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:7e50d0a0cc3189f9cb0aeb3a6a6af18c16f59f004b866cd2be1c14b36134a4a0"}, - {file = "numpy-1.26.4.tar.gz", hash = "sha256:2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010"}, + {file = "numpy-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0fbb536eac80e27a2793ffd787895242b7f18ef792563d742c2d673bfcb75134"}, + {file = "numpy-2.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:69ff563d43c69b1baba77af455dd0a839df8d25e8590e79c90fcbe1499ebde42"}, + {file = "numpy-2.0.1-cp310-cp310-macosx_14_0_arm64.whl", hash = "sha256:1b902ce0e0a5bb7704556a217c4f63a7974f8f43e090aff03fcf262e0b135e02"}, + {file = "numpy-2.0.1-cp310-cp310-macosx_14_0_x86_64.whl", hash = "sha256:f1659887361a7151f89e79b276ed8dff3d75877df906328f14d8bb40bb4f5101"}, + {file = "numpy-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4658c398d65d1b25e1760de3157011a80375da861709abd7cef3bad65d6543f9"}, + {file = "numpy-2.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4127d4303b9ac9f94ca0441138acead39928938660ca58329fe156f84b9f3015"}, + {file = "numpy-2.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:e5eeca8067ad04bc8a2a8731183d51d7cbaac66d86085d5f4766ee6bf19c7f87"}, + {file = "numpy-2.0.1-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:9adbd9bb520c866e1bfd7e10e1880a1f7749f1f6e5017686a5fbb9b72cf69f82"}, + {file = "numpy-2.0.1-cp310-cp310-win32.whl", hash = "sha256:7b9853803278db3bdcc6cd5beca37815b133e9e77ff3d4733c247414e78eb8d1"}, + {file = "numpy-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:81b0893a39bc5b865b8bf89e9ad7807e16717f19868e9d234bdaf9b1f1393868"}, + {file = "numpy-2.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:75b4e316c5902d8163ef9d423b1c3f2f6252226d1aa5cd8a0a03a7d01ffc6268"}, + {file = "numpy-2.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:6e4eeb6eb2fced786e32e6d8df9e755ce5be920d17f7ce00bc38fcde8ccdbf9e"}, + {file = "numpy-2.0.1-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:a1e01dcaab205fbece13c1410253a9eea1b1c9b61d237b6fa59bcc46e8e89343"}, + {file = "numpy-2.0.1-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:a8fc2de81ad835d999113ddf87d1ea2b0f4704cbd947c948d2f5513deafe5a7b"}, + {file = "numpy-2.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5a3d94942c331dd4e0e1147f7a8699a4aa47dffc11bf8a1523c12af8b2e91bbe"}, + {file = "numpy-2.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:15eb4eca47d36ec3f78cde0a3a2ee24cf05ca7396ef808dda2c0ddad7c2bde67"}, + {file = "numpy-2.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:b83e16a5511d1b1f8a88cbabb1a6f6a499f82c062a4251892d9ad5d609863fb7"}, + {file = "numpy-2.0.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:1f87fec1f9bc1efd23f4227becff04bd0e979e23ca50cc92ec88b38489db3b55"}, + {file = "numpy-2.0.1-cp311-cp311-win32.whl", hash = "sha256:36d3a9405fd7c511804dc56fc32974fa5533bdeb3cd1604d6b8ff1d292b819c4"}, + {file = "numpy-2.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:08458fbf403bff5e2b45f08eda195d4b0c9b35682311da5a5a0a0925b11b9bd8"}, + {file = "numpy-2.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:6bf4e6f4a2a2e26655717a1983ef6324f2664d7011f6ef7482e8c0b3d51e82ac"}, + {file = "numpy-2.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:7d6fddc5fe258d3328cd8e3d7d3e02234c5d70e01ebe377a6ab92adb14039cb4"}, + {file = "numpy-2.0.1-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:5daab361be6ddeb299a918a7c0864fa8618af66019138263247af405018b04e1"}, + {file = "numpy-2.0.1-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:ea2326a4dca88e4a274ba3a4405eb6c6467d3ffbd8c7d38632502eaae3820587"}, + {file = "numpy-2.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:529af13c5f4b7a932fb0e1911d3a75da204eff023ee5e0e79c1751564221a5c8"}, + {file = "numpy-2.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6790654cb13eab303d8402354fabd47472b24635700f631f041bd0b65e37298a"}, + {file = "numpy-2.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:cbab9fc9c391700e3e1287666dfd82d8666d10e69a6c4a09ab97574c0b7ee0a7"}, + {file = "numpy-2.0.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:99d0d92a5e3613c33a5f01db206a33f8fdf3d71f2912b0de1739894668b7a93b"}, + {file = "numpy-2.0.1-cp312-cp312-win32.whl", hash = "sha256:173a00b9995f73b79eb0191129f2455f1e34c203f559dd118636858cc452a1bf"}, + {file = "numpy-2.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:bb2124fdc6e62baae159ebcfa368708867eb56806804d005860b6007388df171"}, + {file = "numpy-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bfc085b28d62ff4009364e7ca34b80a9a080cbd97c2c0630bb5f7f770dae9414"}, + {file = "numpy-2.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8fae4ebbf95a179c1156fab0b142b74e4ba4204c87bde8d3d8b6f9c34c5825ef"}, + {file = "numpy-2.0.1-cp39-cp39-macosx_14_0_arm64.whl", hash = "sha256:72dc22e9ec8f6eaa206deb1b1355eb2e253899d7347f5e2fae5f0af613741d06"}, + {file = "numpy-2.0.1-cp39-cp39-macosx_14_0_x86_64.whl", hash = "sha256:ec87f5f8aca726117a1c9b7083e7656a9d0d606eec7299cc067bb83d26f16e0c"}, + {file = "numpy-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1f682ea61a88479d9498bf2091fdcd722b090724b08b31d63e022adc063bad59"}, + {file = "numpy-2.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8efc84f01c1cd7e34b3fb310183e72fcdf55293ee736d679b6d35b35d80bba26"}, + {file = "numpy-2.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:3fdabe3e2a52bc4eff8dc7a5044342f8bd9f11ef0934fcd3289a788c0eb10018"}, + {file = "numpy-2.0.1-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:24a0e1befbfa14615b49ba9659d3d8818a0f4d8a1c5822af8696706fbda7310c"}, + {file = "numpy-2.0.1-cp39-cp39-win32.whl", hash = "sha256:f9cf5ea551aec449206954b075db819f52adc1638d46a6738253a712d553c7b4"}, + {file = "numpy-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:e9e81fa9017eaa416c056e5d9e71be93d05e2c3c2ab308d23307a8bc4443c368"}, + {file = "numpy-2.0.1-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:61728fba1e464f789b11deb78a57805c70b2ed02343560456190d0501ba37b0f"}, + {file = "numpy-2.0.1-pp39-pypy39_pp73-macosx_14_0_x86_64.whl", hash = "sha256:12f5d865d60fb9734e60a60f1d5afa6d962d8d4467c120a1c0cda6eb2964437d"}, + {file = "numpy-2.0.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eacf3291e263d5a67d8c1a581a8ebbcfd6447204ef58828caf69a5e3e8c75990"}, + {file = "numpy-2.0.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:2c3a346ae20cfd80b6cfd3e60dc179963ef2ea58da5ec074fd3d9e7a1e7ba97f"}, + {file = "numpy-2.0.1.tar.gz", hash = "sha256:485b87235796410c3519a699cfe1faab097e509e90ebb05dcd098db2ae87e7b3"}, ] [[package]] name = "packaging" -version = "24.0" +version = "24.1" description = "Core utilities for Python packages" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "packaging-24.0-py3-none-any.whl", hash = "sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5"}, - {file = "packaging-24.0.tar.gz", hash = "sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9"}, + {file = "packaging-24.1-py3-none-any.whl", hash = "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124"}, + {file = "packaging-24.1.tar.gz", hash = "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002"}, ] [[package]] @@ -1385,21 +996,6 @@ files = [ {file = "paginate-0.5.6.tar.gz", hash = "sha256:5e6007b6a9398177a7e1648d04fdd9f8c9766a1a945bceac82f1929e8c78af2d"}, ] -[[package]] -name = "parso" -version = "0.8.4" -description = "A Python Parser" -optional = false -python-versions = ">=3.6" -files = [ - {file = "parso-0.8.4-py2.py3-none-any.whl", hash = "sha256:a418670a20291dacd2dddc80c377c5c3791378ee1e8d12bffc35420643d43f18"}, - {file = "parso-0.8.4.tar.gz", hash = "sha256:eb3a7b58240fb99099a345571deecc0f9540ea5f4dd2fe14c2a99d6b281ab92d"}, -] - -[package.extras] -qa = ["flake8 (==5.0.4)", "mypy (==0.971)", "types-setuptools (==67.2.0.1)"] -testing = ["docopt", "pytest"] - [[package]] name = "pathspec" version = "0.12.1" @@ -1411,115 +1007,15 @@ files = [ {file = "pathspec-0.12.1.tar.gz", hash = "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712"}, ] -[[package]] -name = "pexpect" -version = "4.9.0" -description = "Pexpect allows easy control of interactive console applications." -optional = false -python-versions = "*" -files = [ - {file = "pexpect-4.9.0-py2.py3-none-any.whl", hash = "sha256:7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523"}, - {file = "pexpect-4.9.0.tar.gz", hash = "sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f"}, -] - -[package.dependencies] -ptyprocess = ">=0.5" - -[[package]] -name = "pillow" -version = "10.3.0" -description = "Python Imaging Library (Fork)" -optional = false -python-versions = ">=3.8" -files = [ - {file = "pillow-10.3.0-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:90b9e29824800e90c84e4022dd5cc16eb2d9605ee13f05d47641eb183cd73d45"}, - {file = "pillow-10.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a2c405445c79c3f5a124573a051062300936b0281fee57637e706453e452746c"}, - {file = "pillow-10.3.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:78618cdbccaa74d3f88d0ad6cb8ac3007f1a6fa5c6f19af64b55ca170bfa1edf"}, - {file = "pillow-10.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:261ddb7ca91fcf71757979534fb4c128448b5b4c55cb6152d280312062f69599"}, - {file = "pillow-10.3.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:ce49c67f4ea0609933d01c0731b34b8695a7a748d6c8d186f95e7d085d2fe475"}, - {file = "pillow-10.3.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:b14f16f94cbc61215115b9b1236f9c18403c15dd3c52cf629072afa9d54c1cbf"}, - {file = "pillow-10.3.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d33891be6df59d93df4d846640f0e46f1a807339f09e79a8040bc887bdcd7ed3"}, - {file = "pillow-10.3.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b50811d664d392f02f7761621303eba9d1b056fb1868c8cdf4231279645c25f5"}, - {file = "pillow-10.3.0-cp310-cp310-win32.whl", hash = "sha256:ca2870d5d10d8726a27396d3ca4cf7976cec0f3cb706debe88e3a5bd4610f7d2"}, - {file = "pillow-10.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:f0d0591a0aeaefdaf9a5e545e7485f89910c977087e7de2b6c388aec32011e9f"}, - {file = "pillow-10.3.0-cp310-cp310-win_arm64.whl", hash = "sha256:ccce24b7ad89adb5a1e34a6ba96ac2530046763912806ad4c247356a8f33a67b"}, - {file = "pillow-10.3.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:5f77cf66e96ae734717d341c145c5949c63180842a545c47a0ce7ae52ca83795"}, - {file = "pillow-10.3.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e4b878386c4bf293578b48fc570b84ecfe477d3b77ba39a6e87150af77f40c57"}, - {file = "pillow-10.3.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fdcbb4068117dfd9ce0138d068ac512843c52295ed996ae6dd1faf537b6dbc27"}, - {file = "pillow-10.3.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9797a6c8fe16f25749b371c02e2ade0efb51155e767a971c61734b1bf6293994"}, - {file = "pillow-10.3.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:9e91179a242bbc99be65e139e30690e081fe6cb91a8e77faf4c409653de39451"}, - {file = "pillow-10.3.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:1b87bd9d81d179bd8ab871603bd80d8645729939f90b71e62914e816a76fc6bd"}, - {file = "pillow-10.3.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:81d09caa7b27ef4e61cb7d8fbf1714f5aec1c6b6c5270ee53504981e6e9121ad"}, - {file = "pillow-10.3.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:048ad577748b9fa4a99a0548c64f2cb8d672d5bf2e643a739ac8faff1164238c"}, - {file = "pillow-10.3.0-cp311-cp311-win32.whl", hash = "sha256:7161ec49ef0800947dc5570f86568a7bb36fa97dd09e9827dc02b718c5643f09"}, - {file = "pillow-10.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:8eb0908e954d093b02a543dc963984d6e99ad2b5e36503d8a0aaf040505f747d"}, - {file = "pillow-10.3.0-cp311-cp311-win_arm64.whl", hash = "sha256:4e6f7d1c414191c1199f8996d3f2282b9ebea0945693fb67392c75a3a320941f"}, - {file = "pillow-10.3.0-cp312-cp312-macosx_10_10_x86_64.whl", hash = "sha256:e46f38133e5a060d46bd630faa4d9fa0202377495df1f068a8299fd78c84de84"}, - {file = "pillow-10.3.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:50b8eae8f7334ec826d6eeffaeeb00e36b5e24aa0b9df322c247539714c6df19"}, - {file = "pillow-10.3.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9d3bea1c75f8c53ee4d505c3e67d8c158ad4df0d83170605b50b64025917f338"}, - {file = "pillow-10.3.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:19aeb96d43902f0a783946a0a87dbdad5c84c936025b8419da0a0cd7724356b1"}, - {file = "pillow-10.3.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:74d28c17412d9caa1066f7a31df8403ec23d5268ba46cd0ad2c50fb82ae40462"}, - {file = "pillow-10.3.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:ff61bfd9253c3915e6d41c651d5f962da23eda633cf02262990094a18a55371a"}, - {file = "pillow-10.3.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:d886f5d353333b4771d21267c7ecc75b710f1a73d72d03ca06df49b09015a9ef"}, - {file = "pillow-10.3.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4b5ec25d8b17217d635f8935dbc1b9aa5907962fae29dff220f2659487891cd3"}, - {file = "pillow-10.3.0-cp312-cp312-win32.whl", hash = "sha256:51243f1ed5161b9945011a7360e997729776f6e5d7005ba0c6879267d4c5139d"}, - {file = "pillow-10.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:412444afb8c4c7a6cc11a47dade32982439925537e483be7c0ae0cf96c4f6a0b"}, - {file = "pillow-10.3.0-cp312-cp312-win_arm64.whl", hash = "sha256:798232c92e7665fe82ac085f9d8e8ca98826f8e27859d9a96b41d519ecd2e49a"}, - {file = "pillow-10.3.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:4eaa22f0d22b1a7e93ff0a596d57fdede2e550aecffb5a1ef1106aaece48e96b"}, - {file = "pillow-10.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:cd5e14fbf22a87321b24c88669aad3a51ec052eb145315b3da3b7e3cc105b9a2"}, - {file = "pillow-10.3.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1530e8f3a4b965eb6a7785cf17a426c779333eb62c9a7d1bbcf3ffd5bf77a4aa"}, - {file = "pillow-10.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d512aafa1d32efa014fa041d38868fda85028e3f930a96f85d49c7d8ddc0383"}, - {file = "pillow-10.3.0-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:339894035d0ede518b16073bdc2feef4c991ee991a29774b33e515f1d308e08d"}, - {file = "pillow-10.3.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:aa7e402ce11f0885305bfb6afb3434b3cd8f53b563ac065452d9d5654c7b86fd"}, - {file = "pillow-10.3.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:0ea2a783a2bdf2a561808fe4a7a12e9aa3799b701ba305de596bc48b8bdfce9d"}, - {file = "pillow-10.3.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c78e1b00a87ce43bb37642c0812315b411e856a905d58d597750eb79802aaaa3"}, - {file = "pillow-10.3.0-cp38-cp38-win32.whl", hash = "sha256:72d622d262e463dfb7595202d229f5f3ab4b852289a1cd09650362db23b9eb0b"}, - {file = "pillow-10.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:2034f6759a722da3a3dbd91a81148cf884e91d1b747992ca288ab88c1de15999"}, - {file = "pillow-10.3.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:2ed854e716a89b1afcedea551cd85f2eb2a807613752ab997b9974aaa0d56936"}, - {file = "pillow-10.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:dc1a390a82755a8c26c9964d457d4c9cbec5405896cba94cf51f36ea0d855002"}, - {file = "pillow-10.3.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4203efca580f0dd6f882ca211f923168548f7ba334c189e9eab1178ab840bf60"}, - {file = "pillow-10.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3102045a10945173d38336f6e71a8dc71bcaeed55c3123ad4af82c52807b9375"}, - {file = "pillow-10.3.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:6fb1b30043271ec92dc65f6d9f0b7a830c210b8a96423074b15c7bc999975f57"}, - {file = "pillow-10.3.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:1dfc94946bc60ea375cc39cff0b8da6c7e5f8fcdc1d946beb8da5c216156ddd8"}, - {file = "pillow-10.3.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b09b86b27a064c9624d0a6c54da01c1beaf5b6cadfa609cf63789b1d08a797b9"}, - {file = "pillow-10.3.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d3b2348a78bc939b4fed6552abfd2e7988e0f81443ef3911a4b8498ca084f6eb"}, - {file = "pillow-10.3.0-cp39-cp39-win32.whl", hash = "sha256:45ebc7b45406febf07fef35d856f0293a92e7417ae7933207e90bf9090b70572"}, - {file = "pillow-10.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:0ba26351b137ca4e0db0342d5d00d2e355eb29372c05afd544ebf47c0956ffeb"}, - {file = "pillow-10.3.0-cp39-cp39-win_arm64.whl", hash = "sha256:50fd3f6b26e3441ae07b7c979309638b72abc1a25da31a81a7fbd9495713ef4f"}, - {file = "pillow-10.3.0-pp310-pypy310_pp73-macosx_10_10_x86_64.whl", hash = "sha256:6b02471b72526ab8a18c39cb7967b72d194ec53c1fd0a70b050565a0f366d355"}, - {file = "pillow-10.3.0-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:8ab74c06ffdab957d7670c2a5a6e1a70181cd10b727cd788c4dd9005b6a8acd9"}, - {file = "pillow-10.3.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:048eeade4c33fdf7e08da40ef402e748df113fd0b4584e32c4af74fe78baaeb2"}, - {file = "pillow-10.3.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9e2ec1e921fd07c7cda7962bad283acc2f2a9ccc1b971ee4b216b75fad6f0463"}, - {file = "pillow-10.3.0-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:4c8e73e99da7db1b4cad7f8d682cf6abad7844da39834c288fbfa394a47bbced"}, - {file = "pillow-10.3.0-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:16563993329b79513f59142a6b02055e10514c1a8e86dca8b48a893e33cf91e3"}, - {file = "pillow-10.3.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:dd78700f5788ae180b5ee8902c6aea5a5726bac7c364b202b4b3e3ba2d293170"}, - {file = "pillow-10.3.0-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:aff76a55a8aa8364d25400a210a65ff59d0168e0b4285ba6bf2bd83cf675ba32"}, - {file = "pillow-10.3.0-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:b7bc2176354defba3edc2b9a777744462da2f8e921fbaf61e52acb95bafa9828"}, - {file = "pillow-10.3.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:793b4e24db2e8742ca6423d3fde8396db336698c55cd34b660663ee9e45ed37f"}, - {file = "pillow-10.3.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d93480005693d247f8346bc8ee28c72a2191bdf1f6b5db469c096c0c867ac015"}, - {file = "pillow-10.3.0-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:c83341b89884e2b2e55886e8fbbf37c3fa5efd6c8907124aeb72f285ae5696e5"}, - {file = "pillow-10.3.0-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:1a1d1915db1a4fdb2754b9de292642a39a7fb28f1736699527bb649484fb966a"}, - {file = "pillow-10.3.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:a0eaa93d054751ee9964afa21c06247779b90440ca41d184aeb5d410f20ff591"}, - {file = "pillow-10.3.0.tar.gz", hash = "sha256:9d2455fbf44c914840c793e89aa82d0e1763a14253a000743719ae5946814b2d"}, -] - -[package.extras] -docs = ["furo", "olefile", "sphinx (>=2.4)", "sphinx-copybutton", "sphinx-inline-tabs", "sphinx-removed-in", "sphinxext-opengraph"] -fpx = ["olefile"] -mic = ["olefile"] -tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "packaging", "pyroma", "pytest", "pytest-cov", "pytest-timeout"] -typing = ["typing-extensions"] -xmp = ["defusedxml"] - [[package]] name = "platformdirs" -version = "4.2.1" +version = "4.2.2" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a `user data dir`." optional = false python-versions = ">=3.8" files = [ - {file = "platformdirs-4.2.1-py3-none-any.whl", hash = "sha256:17d5a1161b3fd67b390023cb2d3b026bbd40abde6fdb052dfbd3a29c3ba22ee1"}, - {file = "platformdirs-4.2.1.tar.gz", hash = "sha256:031cd18d4ec63ec53e82dceaac0417d218a6863f7745dfcc9efe7793b7039bdf"}, + {file = "platformdirs-4.2.2-py3-none-any.whl", hash = "sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee"}, + {file = "platformdirs-4.2.2.tar.gz", hash = "sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3"}, ] [package.extras] @@ -1542,73 +1038,6 @@ files = [ dev = ["pre-commit", "tox"] testing = ["pytest", "pytest-benchmark"] -[[package]] -name = "prompt-toolkit" -version = "3.0.43" -description = "Library for building powerful interactive command lines in Python" -optional = false -python-versions = ">=3.7.0" -files = [ - {file = "prompt_toolkit-3.0.43-py3-none-any.whl", hash = "sha256:a11a29cb3bf0a28a387fe5122cdb649816a957cd9261dcedf8c9f1fef33eacf6"}, - {file = "prompt_toolkit-3.0.43.tar.gz", hash = "sha256:3527b7af26106cbc65a040bcc84839a3566ec1b051bb0bfe953631e704b0ff7d"}, -] - -[package.dependencies] -wcwidth = "*" - -[[package]] -name = "psutil" -version = "5.9.8" -description = "Cross-platform lib for process and system monitoring in Python." -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" -files = [ - {file = "psutil-5.9.8-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:26bd09967ae00920df88e0352a91cff1a78f8d69b3ecabbfe733610c0af486c8"}, - {file = "psutil-5.9.8-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:05806de88103b25903dff19bb6692bd2e714ccf9e668d050d144012055cbca73"}, - {file = "psutil-5.9.8-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:611052c4bc70432ec770d5d54f64206aa7203a101ec273a0cd82418c86503bb7"}, - {file = "psutil-5.9.8-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:50187900d73c1381ba1454cf40308c2bf6f34268518b3f36a9b663ca87e65e36"}, - {file = "psutil-5.9.8-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:02615ed8c5ea222323408ceba16c60e99c3f91639b07da6373fb7e6539abc56d"}, - {file = "psutil-5.9.8-cp27-none-win32.whl", hash = "sha256:36f435891adb138ed3c9e58c6af3e2e6ca9ac2f365efe1f9cfef2794e6c93b4e"}, - {file = "psutil-5.9.8-cp27-none-win_amd64.whl", hash = "sha256:bd1184ceb3f87651a67b2708d4c3338e9b10c5df903f2e3776b62303b26cb631"}, - {file = "psutil-5.9.8-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:aee678c8720623dc456fa20659af736241f575d79429a0e5e9cf88ae0605cc81"}, - {file = "psutil-5.9.8-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8cb6403ce6d8e047495a701dc7c5bd788add903f8986d523e3e20b98b733e421"}, - {file = "psutil-5.9.8-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d06016f7f8625a1825ba3732081d77c94589dca78b7a3fc072194851e88461a4"}, - {file = "psutil-5.9.8-cp36-cp36m-win32.whl", hash = "sha256:7d79560ad97af658a0f6adfef8b834b53f64746d45b403f225b85c5c2c140eee"}, - {file = "psutil-5.9.8-cp36-cp36m-win_amd64.whl", hash = "sha256:27cc40c3493bb10de1be4b3f07cae4c010ce715290a5be22b98493509c6299e2"}, - {file = "psutil-5.9.8-cp37-abi3-win32.whl", hash = "sha256:bc56c2a1b0d15aa3eaa5a60c9f3f8e3e565303b465dbf57a1b730e7a2b9844e0"}, - {file = "psutil-5.9.8-cp37-abi3-win_amd64.whl", hash = "sha256:8db4c1b57507eef143a15a6884ca10f7c73876cdf5d51e713151c1236a0e68cf"}, - {file = "psutil-5.9.8-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:d16bbddf0693323b8c6123dd804100241da461e41d6e332fb0ba6058f630f8c8"}, - {file = "psutil-5.9.8.tar.gz", hash = "sha256:6be126e3225486dff286a8fb9a06246a5253f4c7c53b475ea5f5ac934e64194c"}, -] - -[package.extras] -test = ["enum34", "ipaddress", "mock", "pywin32", "wmi"] - -[[package]] -name = "ptyprocess" -version = "0.7.0" -description = "Run a subprocess in a pseudo terminal" -optional = false -python-versions = "*" -files = [ - {file = "ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35"}, - {file = "ptyprocess-0.7.0.tar.gz", hash = "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"}, -] - -[[package]] -name = "pure-eval" -version = "0.2.2" -description = "Safely evaluate AST nodes without side effects" -optional = false -python-versions = "*" -files = [ - {file = "pure_eval-0.2.2-py3-none-any.whl", hash = "sha256:01eaab343580944bc56080ebe0a674b39ec44a945e6d09ba7db3cb8cec289350"}, - {file = "pure_eval-0.2.2.tar.gz", hash = "sha256:2b45320af6dfaa1750f543d714b6d1c520a1688dec6fd24d339063ce0aaa9ac3"}, -] - -[package.extras] -tests = ["pytest"] - [[package]] name = "pycodestyle" version = "2.12.0" @@ -1647,13 +1076,13 @@ windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pymdown-extensions" -version = "10.8.1" +version = "10.9" description = "Extension pack for Python Markdown." optional = false python-versions = ">=3.8" files = [ - {file = "pymdown_extensions-10.8.1-py3-none-any.whl", hash = "sha256:f938326115884f48c6059c67377c46cf631c733ef3629b6eed1349989d1b30cb"}, - {file = "pymdown_extensions-10.8.1.tar.gz", hash = "sha256:3ab1db5c9e21728dabf75192d71471f8e50f216627e9a1fa9535ecb0231b9940"}, + {file = "pymdown_extensions-10.9-py3-none-any.whl", hash = "sha256:d323f7e90d83c86113ee78f3fe62fc9dee5f56b54d912660703ea1816fed5626"}, + {file = "pymdown_extensions-10.9.tar.gz", hash = "sha256:6ff740bcd99ec4172a938970d42b96128bdc9d4b9bcad72494f29921dc69b753"}, ] [package.dependencies] @@ -1699,35 +1128,33 @@ diagrams = ["jinja2", "railroad-diagrams"] [[package]] name = "pytest" -version = "7.4.4" +version = "8.3.2" description = "pytest: simple powerful testing with Python" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "pytest-7.4.4-py3-none-any.whl", hash = "sha256:b090cdf5ed60bf4c45261be03239c2c1c22df034fbffe691abe93cd80cea01d8"}, - {file = "pytest-7.4.4.tar.gz", hash = "sha256:2cf0005922c6ace4a3e2ec8b4080eb0d9753fdc93107415332f50ce9e7994280"}, + {file = "pytest-8.3.2-py3-none-any.whl", hash = "sha256:4ba08f9ae7dcf84ded419494d229b48d0903ea6407b030eaec46df5e6a73bba5"}, + {file = "pytest-8.3.2.tar.gz", hash = "sha256:c132345d12ce551242c87269de812483f5bcc87cdbb4722e48487ba194f9fdce"}, ] [package.dependencies] colorama = {version = "*", markers = "sys_platform == \"win32\""} -exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} iniconfig = "*" packaging = "*" -pluggy = ">=0.12,<2.0" -tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""} +pluggy = ">=1.5,<2" [package.extras] -testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] +dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] [[package]] name = "pytest-cov" -version = "4.1.0" +version = "5.0.0" description = "Pytest plugin for measuring coverage." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "pytest-cov-4.1.0.tar.gz", hash = "sha256:3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6a10ef6"}, - {file = "pytest_cov-4.1.0-py3-none-any.whl", hash = "sha256:6ba70b9e97e69fcc3fb45bfeab2d0a138fb65c4d0d6a41ef33983ad114be8c3a"}, + {file = "pytest-cov-5.0.0.tar.gz", hash = "sha256:5837b58e9f6ebd335b0f8060eecce69b662415b16dc503883a02f45dfeb14857"}, + {file = "pytest_cov-5.0.0-py3-none-any.whl", hash = "sha256:4f0764a1219df53214206bf1feea4633c3b558a2925c8b59f144f682861ce652"}, ] [package.dependencies] @@ -1735,20 +1162,21 @@ coverage = {version = ">=5.2.1", extras = ["toml"]} pytest = ">=4.6" [package.extras] -testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"] +testing = ["fields", "hunter", "process-tests", "pytest-xdist", "virtualenv"] [[package]] name = "pytest-dependency" -version = "0.5.1" +version = "0.6.0" description = "Manage dependencies of tests" optional = false -python-versions = "*" +python-versions = ">=3.4" files = [ - {file = "pytest-dependency-0.5.1.tar.gz", hash = "sha256:c2a892906192663f85030a6ab91304e508e546cddfe557d692d61ec57a1d946b"}, + {file = "pytest-dependency-0.6.0.tar.gz", hash = "sha256:934b0e6a39d95995062c193f7eaeed8a8ffa06ff1bcef4b62b0dc74a708bacc1"}, ] [package.dependencies] -pytest = ">=3.6.0" +pytest = ">=3.7.0" +setuptools = "*" [[package]] name = "python-dateutil" @@ -1764,29 +1192,6 @@ files = [ [package.dependencies] six = ">=1.5" -[[package]] -name = "pywin32" -version = "306" -description = "Python for Window Extensions" -optional = false -python-versions = "*" -files = [ - {file = "pywin32-306-cp310-cp310-win32.whl", hash = "sha256:06d3420a5155ba65f0b72f2699b5bacf3109f36acbe8923765c22938a69dfc8d"}, - {file = "pywin32-306-cp310-cp310-win_amd64.whl", hash = "sha256:84f4471dbca1887ea3803d8848a1616429ac94a4a8d05f4bc9c5dcfd42ca99c8"}, - {file = "pywin32-306-cp311-cp311-win32.whl", hash = "sha256:e65028133d15b64d2ed8f06dd9fbc268352478d4f9289e69c190ecd6818b6407"}, - {file = "pywin32-306-cp311-cp311-win_amd64.whl", hash = "sha256:a7639f51c184c0272e93f244eb24dafca9b1855707d94c192d4a0b4c01e1100e"}, - {file = "pywin32-306-cp311-cp311-win_arm64.whl", hash = "sha256:70dba0c913d19f942a2db25217d9a1b726c278f483a919f1abfed79c9cf64d3a"}, - {file = "pywin32-306-cp312-cp312-win32.whl", hash = "sha256:383229d515657f4e3ed1343da8be101000562bf514591ff383ae940cad65458b"}, - {file = "pywin32-306-cp312-cp312-win_amd64.whl", hash = "sha256:37257794c1ad39ee9be652da0462dc2e394c8159dfd913a8a4e8eb6fd346da0e"}, - {file = "pywin32-306-cp312-cp312-win_arm64.whl", hash = "sha256:5821ec52f6d321aa59e2db7e0a35b997de60c201943557d108af9d4ae1ec7040"}, - {file = "pywin32-306-cp37-cp37m-win32.whl", hash = "sha256:1c73ea9a0d2283d889001998059f5eaaba3b6238f767c9cf2833b13e6a685f65"}, - {file = "pywin32-306-cp37-cp37m-win_amd64.whl", hash = "sha256:72c5f621542d7bdd4fdb716227be0dd3f8565c11b280be6315b06ace35487d36"}, - {file = "pywin32-306-cp38-cp38-win32.whl", hash = "sha256:e4c092e2589b5cf0d365849e73e02c391c1349958c5ac3e9d5ccb9a28e017b3a"}, - {file = "pywin32-306-cp38-cp38-win_amd64.whl", hash = "sha256:e8ac1ae3601bee6ca9f7cb4b5363bf1c0badb935ef243c4733ff9a393b1690c0"}, - {file = "pywin32-306-cp39-cp39-win32.whl", hash = "sha256:e25fd5b485b55ac9c057f67d94bc203f3f6595078d1fb3b458c9c28b7153a802"}, - {file = "pywin32-306-cp39-cp39-win_amd64.whl", hash = "sha256:39b61c15272833b5c329a2989999dcae836b1eed650252ab1b7bfbe1d59f30f4"}, -] - [[package]] name = "pyyaml" version = "6.0.1" @@ -1861,203 +1266,103 @@ files = [ [package.dependencies] pyyaml = "*" -[[package]] -name = "pyzmq" -version = "26.0.3" -description = "Python bindings for 0MQ" -optional = false -python-versions = ">=3.7" -files = [ - {file = "pyzmq-26.0.3-cp310-cp310-macosx_10_15_universal2.whl", hash = "sha256:44dd6fc3034f1eaa72ece33588867df9e006a7303725a12d64c3dff92330f625"}, - {file = "pyzmq-26.0.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:acb704195a71ac5ea5ecf2811c9ee19ecdc62b91878528302dd0be1b9451cc90"}, - {file = "pyzmq-26.0.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5dbb9c997932473a27afa93954bb77a9f9b786b4ccf718d903f35da3232317de"}, - {file = "pyzmq-26.0.3-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6bcb34f869d431799c3ee7d516554797f7760cb2198ecaa89c3f176f72d062be"}, - {file = "pyzmq-26.0.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:38ece17ec5f20d7d9b442e5174ae9f020365d01ba7c112205a4d59cf19dc38ee"}, - {file = "pyzmq-26.0.3-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:ba6e5e6588e49139a0979d03a7deb9c734bde647b9a8808f26acf9c547cab1bf"}, - {file = "pyzmq-26.0.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:3bf8b000a4e2967e6dfdd8656cd0757d18c7e5ce3d16339e550bd462f4857e59"}, - {file = "pyzmq-26.0.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:2136f64fbb86451dbbf70223635a468272dd20075f988a102bf8a3f194a411dc"}, - {file = "pyzmq-26.0.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:e8918973fbd34e7814f59143c5f600ecd38b8038161239fd1a3d33d5817a38b8"}, - {file = "pyzmq-26.0.3-cp310-cp310-win32.whl", hash = "sha256:0aaf982e68a7ac284377d051c742610220fd06d330dcd4c4dbb4cdd77c22a537"}, - {file = "pyzmq-26.0.3-cp310-cp310-win_amd64.whl", hash = "sha256:f1a9b7d00fdf60b4039f4455afd031fe85ee8305b019334b72dcf73c567edc47"}, - {file = "pyzmq-26.0.3-cp310-cp310-win_arm64.whl", hash = "sha256:80b12f25d805a919d53efc0a5ad7c0c0326f13b4eae981a5d7b7cc343318ebb7"}, - {file = "pyzmq-26.0.3-cp311-cp311-macosx_10_15_universal2.whl", hash = "sha256:a72a84570f84c374b4c287183debc776dc319d3e8ce6b6a0041ce2e400de3f32"}, - {file = "pyzmq-26.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:7ca684ee649b55fd8f378127ac8462fb6c85f251c2fb027eb3c887e8ee347bcd"}, - {file = "pyzmq-26.0.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e222562dc0f38571c8b1ffdae9d7adb866363134299264a1958d077800b193b7"}, - {file = "pyzmq-26.0.3-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f17cde1db0754c35a91ac00b22b25c11da6eec5746431d6e5092f0cd31a3fea9"}, - {file = "pyzmq-26.0.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b7c0c0b3244bb2275abe255d4a30c050d541c6cb18b870975553f1fb6f37527"}, - {file = "pyzmq-26.0.3-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:ac97a21de3712afe6a6c071abfad40a6224fd14fa6ff0ff8d0c6e6cd4e2f807a"}, - {file = "pyzmq-26.0.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:88b88282e55fa39dd556d7fc04160bcf39dea015f78e0cecec8ff4f06c1fc2b5"}, - {file = "pyzmq-26.0.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:72b67f966b57dbd18dcc7efbc1c7fc9f5f983e572db1877081f075004614fcdd"}, - {file = "pyzmq-26.0.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:f4b6cecbbf3b7380f3b61de3a7b93cb721125dc125c854c14ddc91225ba52f83"}, - {file = "pyzmq-26.0.3-cp311-cp311-win32.whl", hash = "sha256:eed56b6a39216d31ff8cd2f1d048b5bf1700e4b32a01b14379c3b6dde9ce3aa3"}, - {file = "pyzmq-26.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:3191d312c73e3cfd0f0afdf51df8405aafeb0bad71e7ed8f68b24b63c4f36500"}, - {file = "pyzmq-26.0.3-cp311-cp311-win_arm64.whl", hash = "sha256:b6907da3017ef55139cf0e417c5123a84c7332520e73a6902ff1f79046cd3b94"}, - {file = "pyzmq-26.0.3-cp312-cp312-macosx_10_15_universal2.whl", hash = "sha256:068ca17214038ae986d68f4a7021f97e187ed278ab6dccb79f837d765a54d753"}, - {file = "pyzmq-26.0.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:7821d44fe07335bea256b9f1f41474a642ca55fa671dfd9f00af8d68a920c2d4"}, - {file = "pyzmq-26.0.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eeb438a26d87c123bb318e5f2b3d86a36060b01f22fbdffd8cf247d52f7c9a2b"}, - {file = "pyzmq-26.0.3-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:69ea9d6d9baa25a4dc9cef5e2b77b8537827b122214f210dd925132e34ae9b12"}, - {file = "pyzmq-26.0.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7daa3e1369355766dea11f1d8ef829905c3b9da886ea3152788dc25ee6079e02"}, - {file = "pyzmq-26.0.3-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:6ca7a9a06b52d0e38ccf6bca1aeff7be178917893f3883f37b75589d42c4ac20"}, - {file = "pyzmq-26.0.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:1b7d0e124948daa4d9686d421ef5087c0516bc6179fdcf8828b8444f8e461a77"}, - {file = "pyzmq-26.0.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:e746524418b70f38550f2190eeee834db8850088c834d4c8406fbb9bc1ae10b2"}, - {file = "pyzmq-26.0.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:6b3146f9ae6af82c47a5282ac8803523d381b3b21caeae0327ed2f7ecb718798"}, - {file = "pyzmq-26.0.3-cp312-cp312-win32.whl", hash = "sha256:2b291d1230845871c00c8462c50565a9cd6026fe1228e77ca934470bb7d70ea0"}, - {file = "pyzmq-26.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:926838a535c2c1ea21c903f909a9a54e675c2126728c21381a94ddf37c3cbddf"}, - {file = "pyzmq-26.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:5bf6c237f8c681dfb91b17f8435b2735951f0d1fad10cc5dfd96db110243370b"}, - {file = "pyzmq-26.0.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0c0991f5a96a8e620f7691e61178cd8f457b49e17b7d9cfa2067e2a0a89fc1d5"}, - {file = "pyzmq-26.0.3-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:dbf012d8fcb9f2cf0643b65df3b355fdd74fc0035d70bb5c845e9e30a3a4654b"}, - {file = "pyzmq-26.0.3-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:01fbfbeb8249a68d257f601deb50c70c929dc2dfe683b754659569e502fbd3aa"}, - {file = "pyzmq-26.0.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1c8eb19abe87029c18f226d42b8a2c9efdd139d08f8bf6e085dd9075446db450"}, - {file = "pyzmq-26.0.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:5344b896e79800af86ad643408ca9aa303a017f6ebff8cee5a3163c1e9aec987"}, - {file = "pyzmq-26.0.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:204e0f176fd1d067671157d049466869b3ae1fc51e354708b0dc41cf94e23a3a"}, - {file = "pyzmq-26.0.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:a42db008d58530efa3b881eeee4991146de0b790e095f7ae43ba5cc612decbc5"}, - {file = "pyzmq-26.0.3-cp37-cp37m-win32.whl", hash = "sha256:8d7a498671ca87e32b54cb47c82a92b40130a26c5197d392720a1bce1b3c77cf"}, - {file = "pyzmq-26.0.3-cp37-cp37m-win_amd64.whl", hash = "sha256:3b4032a96410bdc760061b14ed6a33613ffb7f702181ba999df5d16fb96ba16a"}, - {file = "pyzmq-26.0.3-cp38-cp38-macosx_10_15_universal2.whl", hash = "sha256:2cc4e280098c1b192c42a849de8de2c8e0f3a84086a76ec5b07bfee29bda7d18"}, - {file = "pyzmq-26.0.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:5bde86a2ed3ce587fa2b207424ce15b9a83a9fa14422dcc1c5356a13aed3df9d"}, - {file = "pyzmq-26.0.3-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:34106f68e20e6ff253c9f596ea50397dbd8699828d55e8fa18bd4323d8d966e6"}, - {file = "pyzmq-26.0.3-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ebbbd0e728af5db9b04e56389e2299a57ea8b9dd15c9759153ee2455b32be6ad"}, - {file = "pyzmq-26.0.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f6b1d1c631e5940cac5a0b22c5379c86e8df6a4ec277c7a856b714021ab6cfad"}, - {file = "pyzmq-26.0.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:e891ce81edd463b3b4c3b885c5603c00141151dd9c6936d98a680c8c72fe5c67"}, - {file = "pyzmq-26.0.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:9b273ecfbc590a1b98f014ae41e5cf723932f3b53ba9367cfb676f838038b32c"}, - {file = "pyzmq-26.0.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b32bff85fb02a75ea0b68f21e2412255b5731f3f389ed9aecc13a6752f58ac97"}, - {file = "pyzmq-26.0.3-cp38-cp38-win32.whl", hash = "sha256:f6c21c00478a7bea93caaaef9e7629145d4153b15a8653e8bb4609d4bc70dbfc"}, - {file = "pyzmq-26.0.3-cp38-cp38-win_amd64.whl", hash = "sha256:3401613148d93ef0fd9aabdbddb212de3db7a4475367f49f590c837355343972"}, - {file = "pyzmq-26.0.3-cp39-cp39-macosx_10_15_universal2.whl", hash = "sha256:2ed8357f4c6e0daa4f3baf31832df8a33334e0fe5b020a61bc8b345a3db7a606"}, - {file = "pyzmq-26.0.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c1c8f2a2ca45292084c75bb6d3a25545cff0ed931ed228d3a1810ae3758f975f"}, - {file = "pyzmq-26.0.3-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:b63731993cdddcc8e087c64e9cf003f909262b359110070183d7f3025d1c56b5"}, - {file = "pyzmq-26.0.3-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:b3cd31f859b662ac5d7f4226ec7d8bd60384fa037fc02aee6ff0b53ba29a3ba8"}, - {file = "pyzmq-26.0.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:115f8359402fa527cf47708d6f8a0f8234f0e9ca0cab7c18c9c189c194dbf620"}, - {file = "pyzmq-26.0.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:715bdf952b9533ba13dfcf1f431a8f49e63cecc31d91d007bc1deb914f47d0e4"}, - {file = "pyzmq-26.0.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:e1258c639e00bf5e8a522fec6c3eaa3e30cf1c23a2f21a586be7e04d50c9acab"}, - {file = "pyzmq-26.0.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:15c59e780be8f30a60816a9adab900c12a58d79c1ac742b4a8df044ab2a6d920"}, - {file = "pyzmq-26.0.3-cp39-cp39-win32.whl", hash = "sha256:d0cdde3c78d8ab5b46595054e5def32a755fc028685add5ddc7403e9f6de9879"}, - {file = "pyzmq-26.0.3-cp39-cp39-win_amd64.whl", hash = "sha256:ce828058d482ef860746bf532822842e0ff484e27f540ef5c813d516dd8896d2"}, - {file = "pyzmq-26.0.3-cp39-cp39-win_arm64.whl", hash = "sha256:788f15721c64109cf720791714dc14afd0f449d63f3a5487724f024345067381"}, - {file = "pyzmq-26.0.3-pp310-pypy310_pp73-macosx_10_9_x86_64.whl", hash = "sha256:2c18645ef6294d99b256806e34653e86236eb266278c8ec8112622b61db255de"}, - {file = "pyzmq-26.0.3-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7e6bc96ebe49604df3ec2c6389cc3876cabe475e6bfc84ced1bf4e630662cb35"}, - {file = "pyzmq-26.0.3-pp310-pypy310_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:971e8990c5cc4ddcff26e149398fc7b0f6a042306e82500f5e8db3b10ce69f84"}, - {file = "pyzmq-26.0.3-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d8416c23161abd94cc7da80c734ad7c9f5dbebdadfdaa77dad78244457448223"}, - {file = "pyzmq-26.0.3-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:082a2988364b60bb5de809373098361cf1dbb239623e39e46cb18bc035ed9c0c"}, - {file = "pyzmq-26.0.3-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:d57dfbf9737763b3a60d26e6800e02e04284926329aee8fb01049635e957fe81"}, - {file = "pyzmq-26.0.3-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:77a85dca4c2430ac04dc2a2185c2deb3858a34fe7f403d0a946fa56970cf60a1"}, - {file = "pyzmq-26.0.3-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:4c82a6d952a1d555bf4be42b6532927d2a5686dd3c3e280e5f63225ab47ac1f5"}, - {file = "pyzmq-26.0.3-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4496b1282c70c442809fc1b151977c3d967bfb33e4e17cedbf226d97de18f709"}, - {file = "pyzmq-26.0.3-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:e4946d6bdb7ba972dfda282f9127e5756d4f299028b1566d1245fa0d438847e6"}, - {file = "pyzmq-26.0.3-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:03c0ae165e700364b266876d712acb1ac02693acd920afa67da2ebb91a0b3c09"}, - {file = "pyzmq-26.0.3-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:3e3070e680f79887d60feeda051a58d0ac36622e1759f305a41059eff62c6da7"}, - {file = "pyzmq-26.0.3-pp38-pypy38_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:6ca08b840fe95d1c2bd9ab92dac5685f949fc6f9ae820ec16193e5ddf603c3b2"}, - {file = "pyzmq-26.0.3-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e76654e9dbfb835b3518f9938e565c7806976c07b37c33526b574cc1a1050480"}, - {file = "pyzmq-26.0.3-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:871587bdadd1075b112e697173e946a07d722459d20716ceb3d1bd6c64bd08ce"}, - {file = "pyzmq-26.0.3-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:d0a2d1bd63a4ad79483049b26514e70fa618ce6115220da9efdff63688808b17"}, - {file = "pyzmq-26.0.3-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0270b49b6847f0d106d64b5086e9ad5dc8a902413b5dbbb15d12b60f9c1747a4"}, - {file = "pyzmq-26.0.3-pp39-pypy39_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:703c60b9910488d3d0954ca585c34f541e506a091a41930e663a098d3b794c67"}, - {file = "pyzmq-26.0.3-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:74423631b6be371edfbf7eabb02ab995c2563fee60a80a30829176842e71722a"}, - {file = "pyzmq-26.0.3-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:4adfbb5451196842a88fda3612e2c0414134874bffb1c2ce83ab4242ec9e027d"}, - {file = "pyzmq-26.0.3-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:3516119f4f9b8671083a70b6afaa0a070f5683e431ab3dc26e9215620d7ca1ad"}, - {file = "pyzmq-26.0.3.tar.gz", hash = "sha256:dba7d9f2e047dfa2bca3b01f4f84aa5246725203d6284e3790f2ca15fba6b40a"}, -] - -[package.dependencies] -cffi = {version = "*", markers = "implementation_name == \"pypy\""} - [[package]] name = "regex" -version = "2024.5.10" +version = "2024.7.24" description = "Alternative regular expression module, to replace re." optional = false python-versions = ">=3.8" files = [ - {file = "regex-2024.5.10-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:eda3dd46df535da787ffb9036b5140f941ecb91701717df91c9daf64cabef953"}, - {file = "regex-2024.5.10-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:1d5bd666466c8f00a06886ce1397ba8b12371c1f1c6d1bef11013e9e0a1464a8"}, - {file = "regex-2024.5.10-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:32e5f3b8e32918bfbdd12eca62e49ab3031125c454b507127ad6ecbd86e62fca"}, - {file = "regex-2024.5.10-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:534efd2653ebc4f26fc0e47234e53bf0cb4715bb61f98c64d2774a278b58c846"}, - {file = "regex-2024.5.10-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:193b7c6834a06f722f0ce1ba685efe80881de7c3de31415513862f601097648c"}, - {file = "regex-2024.5.10-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:160ba087232c5c6e2a1e7ad08bd3a3f49b58c815be0504d8c8aacfb064491cd8"}, - {file = "regex-2024.5.10-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:951be1eae7b47660412dc4938777a975ebc41936d64e28081bf2e584b47ec246"}, - {file = "regex-2024.5.10-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d8a0f0ab5453e409586b11ebe91c672040bc804ca98d03a656825f7890cbdf88"}, - {file = "regex-2024.5.10-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9e6d4d6ae1827b2f8c7200aaf7501c37cf3f3896c86a6aaf2566448397c823dd"}, - {file = "regex-2024.5.10-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:161a206c8f3511e2f5fafc9142a2cc25d7fe9a1ec5ad9b4ad2496a7c33e1c5d2"}, - {file = "regex-2024.5.10-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:44b3267cea873684af022822195298501568ed44d542f9a2d9bebc0212e99069"}, - {file = "regex-2024.5.10-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:560278c9975694e1f0bc50da187abf2cdc1e4890739ea33df2bc4a85eeef143e"}, - {file = "regex-2024.5.10-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:70364a097437dd0a90b31cd77f09f7387ad9ac60ef57590971f43b7fca3082a5"}, - {file = "regex-2024.5.10-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:42be5de7cc8c1edac55db92d82b68dc8e683b204d6f5414c5a51997a323d7081"}, - {file = "regex-2024.5.10-cp310-cp310-win32.whl", hash = "sha256:9a8625849387b9d558d528e263ecc9c0fbde86cfa5c2f0eef43fff480ae24d71"}, - {file = "regex-2024.5.10-cp310-cp310-win_amd64.whl", hash = "sha256:903350bf44d7e4116b4d5898b30b15755d61dcd3161e3413a49c7db76f0bee5a"}, - {file = "regex-2024.5.10-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:bf9596cba92ce7b1fd32c7b07c6e3212c7eed0edc271757e48bfcd2b54646452"}, - {file = "regex-2024.5.10-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:45cc13d398b6359a7708986386f72bd156ae781c3e83a68a6d4cee5af04b1ce9"}, - {file = "regex-2024.5.10-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ad45f3bccfcb00868f2871dce02a755529838d2b86163ab8a246115e80cfb7d6"}, - {file = "regex-2024.5.10-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:33d19f0cde6838c81acffff25c7708e4adc7dd02896c9ec25c3939b1500a1778"}, - {file = "regex-2024.5.10-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0a9f89d7db5ef6bdf53e5cc8e6199a493d0f1374b3171796b464a74ebe8e508a"}, - {file = "regex-2024.5.10-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8c6c71cf92b09e5faa72ea2c68aa1f61c9ce11cb66fdc5069d712f4392ddfd00"}, - {file = "regex-2024.5.10-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7467ad8b0eac0b28e52679e972b9b234b3de0ea5cee12eb50091d2b68145fe36"}, - {file = "regex-2024.5.10-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bc0db93ad039fc2fe32ccd3dd0e0e70c4f3d6e37ae83f0a487e1aba939bd2fbd"}, - {file = "regex-2024.5.10-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:fa9335674d7c819674467c7b46154196c51efbaf5f5715187fd366814ba3fa39"}, - {file = "regex-2024.5.10-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:7dda3091838206969c2b286f9832dff41e2da545b99d1cfaea9ebd8584d02708"}, - {file = "regex-2024.5.10-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:504b5116e2bd1821efd815941edff7535e93372a098e156bb9dffde30264e798"}, - {file = "regex-2024.5.10-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:91b53dea84415e8115506cc62e441a2b54537359c63d856d73cb1abe05af4c9a"}, - {file = "regex-2024.5.10-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1a3903128f9e17a500618e80c68165c78c741ebb17dd1a0b44575f92c3c68b02"}, - {file = "regex-2024.5.10-cp311-cp311-win32.whl", hash = "sha256:236cace6c1903effd647ed46ce6dd5d76d54985fc36dafc5256032886736c85d"}, - {file = "regex-2024.5.10-cp311-cp311-win_amd64.whl", hash = "sha256:12446827f43c7881decf2c126762e11425de5eb93b3b0d8b581344c16db7047a"}, - {file = "regex-2024.5.10-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:14905ed75c7a6edf423eb46c213ed3f4507c38115f1ed3c00f4ec9eafba50e58"}, - {file = "regex-2024.5.10-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:4fad420b14ae1970a1f322e8ae84a1d9d89375eb71e1b504060ab2d1bfe68f3c"}, - {file = "regex-2024.5.10-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:c46a76a599fcbf95f98755275c5527304cc4f1bb69919434c1e15544d7052910"}, - {file = "regex-2024.5.10-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0faecb6d5779753a6066a3c7a0471a8d29fe25d9981ca9e552d6d1b8f8b6a594"}, - {file = "regex-2024.5.10-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:aab65121229c2ecdf4a31b793d99a6a0501225bd39b616e653c87b219ed34a49"}, - {file = "regex-2024.5.10-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:50e7e96a527488334379e05755b210b7da4a60fc5d6481938c1fa053e0c92184"}, - {file = "regex-2024.5.10-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba034c8db4b264ef1601eb33cd23d87c5013b8fb48b8161debe2e5d3bd9156b0"}, - {file = "regex-2024.5.10-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:031219782d97550c2098d9a68ce9e9eaefe67d2d81d8ff84c8354f9c009e720c"}, - {file = "regex-2024.5.10-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:62b5f7910b639f3c1d122d408421317c351e213ca39c964ad4121f27916631c6"}, - {file = "regex-2024.5.10-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:cd832bd9b6120d6074f39bdfbb3c80e416848b07ac72910f1c7f03131a6debc3"}, - {file = "regex-2024.5.10-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:e91b1976358e17197157b405cab408a5f4e33310cda211c49fc6da7cffd0b2f0"}, - {file = "regex-2024.5.10-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:571452362d552de508c37191b6abbbb660028b8b418e2d68c20779e0bc8eaaa8"}, - {file = "regex-2024.5.10-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:5253dcb0bfda7214523de58b002eb0090cb530d7c55993ce5f6d17faf953ece7"}, - {file = "regex-2024.5.10-cp312-cp312-win32.whl", hash = "sha256:2f30a5ab8902f93930dc6f627c4dd5da2703333287081c85cace0fc6e21c25af"}, - {file = "regex-2024.5.10-cp312-cp312-win_amd64.whl", hash = "sha256:3799e36d60a35162bb35b2246d8bb012192b7437dff807ef79c14e7352706306"}, - {file = "regex-2024.5.10-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:bbdc5db2c98ac2bf1971ffa1410c87ca7a15800415f788971e8ba8520fc0fda9"}, - {file = "regex-2024.5.10-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6ccdeef4584450b6f0bddd5135354908dacad95425fcb629fe36d13e48b60f32"}, - {file = "regex-2024.5.10-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:29d839829209f3c53f004e1de8c3113efce6d98029f044fa5cfee666253ee7e6"}, - {file = "regex-2024.5.10-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0709ba544cf50bd5cb843df4b8bb6701bae2b70a8e88da9add8386cbca5c1385"}, - {file = "regex-2024.5.10-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:972b49f2fe1047b9249c958ec4fa1bdd2cf8ce305dc19d27546d5a38e57732d8"}, - {file = "regex-2024.5.10-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9cdbb1998da94607d5eec02566b9586f0e70d6438abf1b690261aac0edda7ab6"}, - {file = "regex-2024.5.10-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bf7c8ee4861d9ef5b1120abb75846828c811f932d63311596ad25fa168053e00"}, - {file = "regex-2024.5.10-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7d35d4cc9270944e95f9c88af757b0c9fc43f396917e143a5756608462c5223b"}, - {file = "regex-2024.5.10-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:8722f72068b3e1156a4b2e1afde6810f1fc67155a9fa30a4b9d5b4bc46f18fb0"}, - {file = "regex-2024.5.10-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:696639a73ca78a380acfaa0a1f6dd8220616a99074c05bba9ba8bb916914b224"}, - {file = "regex-2024.5.10-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ea057306ab469130167014b662643cfaed84651c792948891d003cf0039223a5"}, - {file = "regex-2024.5.10-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:b43b78f9386d3d932a6ce5af4b45f393d2e93693ee18dc4800d30a8909df700e"}, - {file = "regex-2024.5.10-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:c43395a3b7cc9862801a65c6994678484f186ce13c929abab44fb8a9e473a55a"}, - {file = "regex-2024.5.10-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:0bc94873ba11e34837bffd7e5006703abeffc4514e2f482022f46ce05bd25e67"}, - {file = "regex-2024.5.10-cp38-cp38-win32.whl", hash = "sha256:1118ba9def608250250f4b3e3f48c62f4562ba16ca58ede491b6e7554bfa09ff"}, - {file = "regex-2024.5.10-cp38-cp38-win_amd64.whl", hash = "sha256:458d68d34fb74b906709735c927c029e62f7d06437a98af1b5b6258025223210"}, - {file = "regex-2024.5.10-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:15e593386ec6331e0ab4ac0795b7593f02ab2f4b30a698beb89fbdc34f92386a"}, - {file = "regex-2024.5.10-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:ca23b41355ba95929e9505ee04e55495726aa2282003ed9b012d86f857d3e49b"}, - {file = "regex-2024.5.10-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2c8982ee19ccecabbaeac1ba687bfef085a6352a8c64f821ce2f43e6d76a9298"}, - {file = "regex-2024.5.10-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7117cb7d6ac7f2e985f3d18aa8a1728864097da1a677ffa69e970ca215baebf1"}, - {file = "regex-2024.5.10-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b66421f8878a0c82fc0c272a43e2121c8d4c67cb37429b764f0d5ad70b82993b"}, - {file = "regex-2024.5.10-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:224a9269f133564109ce668213ef3cb32bc72ccf040b0b51c72a50e569e9dc9e"}, - {file = "regex-2024.5.10-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ab98016541543692a37905871a5ffca59b16e08aacc3d7d10a27297b443f572d"}, - {file = "regex-2024.5.10-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:51d27844763c273a122e08a3e86e7aefa54ee09fb672d96a645ece0454d8425e"}, - {file = "regex-2024.5.10-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:853cc36e756ff673bf984e9044ccc8fad60b95a748915dddeab9488aea974c73"}, - {file = "regex-2024.5.10-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4e7eaf9df15423d07b6050fb91f86c66307171b95ea53e2d87a7993b6d02c7f7"}, - {file = "regex-2024.5.10-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:169fd0acd7a259f58f417e492e93d0e15fc87592cd1e971c8c533ad5703b5830"}, - {file = "regex-2024.5.10-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:334b79ce9c08f26b4659a53f42892793948a613c46f1b583e985fd5a6bf1c149"}, - {file = "regex-2024.5.10-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:f03b1dbd4d9596dd84955bb40f7d885204d6aac0d56a919bb1e0ff2fb7e1735a"}, - {file = "regex-2024.5.10-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:cfa6d61a76c77610ba9274c1a90a453062bdf6887858afbe214d18ad41cf6bde"}, - {file = "regex-2024.5.10-cp39-cp39-win32.whl", hash = "sha256:249fbcee0a277c32a3ce36d8e36d50c27c968fdf969e0fbe342658d4e010fbc8"}, - {file = "regex-2024.5.10-cp39-cp39-win_amd64.whl", hash = "sha256:0ce56a923f4c01d7568811bfdffe156268c0a7aae8a94c902b92fe34c4bde785"}, - {file = "regex-2024.5.10.tar.gz", hash = "sha256:304e7e2418146ae4d0ef0e9ffa28f881f7874b45b4994cc2279b21b6e7ae50c8"}, + {file = "regex-2024.7.24-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:228b0d3f567fafa0633aee87f08b9276c7062da9616931382993c03808bb68ce"}, + {file = "regex-2024.7.24-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:3426de3b91d1bc73249042742f45c2148803c111d1175b283270177fdf669024"}, + {file = "regex-2024.7.24-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:f273674b445bcb6e4409bf8d1be67bc4b58e8b46fd0d560055d515b8830063cd"}, + {file = "regex-2024.7.24-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:23acc72f0f4e1a9e6e9843d6328177ae3074b4182167e34119ec7233dfeccf53"}, + {file = "regex-2024.7.24-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:65fd3d2e228cae024c411c5ccdffae4c315271eee4a8b839291f84f796b34eca"}, + {file = "regex-2024.7.24-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c414cbda77dbf13c3bc88b073a1a9f375c7b0cb5e115e15d4b73ec3a2fbc6f59"}, + {file = "regex-2024.7.24-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bf7a89eef64b5455835f5ed30254ec19bf41f7541cd94f266ab7cbd463f00c41"}, + {file = "regex-2024.7.24-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:19c65b00d42804e3fbea9708f0937d157e53429a39b7c61253ff15670ff62cb5"}, + {file = "regex-2024.7.24-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:7a5486ca56c8869070a966321d5ab416ff0f83f30e0e2da1ab48815c8d165d46"}, + {file = "regex-2024.7.24-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:6f51f9556785e5a203713f5efd9c085b4a45aecd2a42573e2b5041881b588d1f"}, + {file = "regex-2024.7.24-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:a4997716674d36a82eab3e86f8fa77080a5d8d96a389a61ea1d0e3a94a582cf7"}, + {file = "regex-2024.7.24-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:c0abb5e4e8ce71a61d9446040c1e86d4e6d23f9097275c5bd49ed978755ff0fe"}, + {file = "regex-2024.7.24-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:18300a1d78cf1290fa583cd8b7cde26ecb73e9f5916690cf9d42de569c89b1ce"}, + {file = "regex-2024.7.24-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:416c0e4f56308f34cdb18c3f59849479dde5b19febdcd6e6fa4d04b6c31c9faa"}, + {file = "regex-2024.7.24-cp310-cp310-win32.whl", hash = "sha256:fb168b5924bef397b5ba13aabd8cf5df7d3d93f10218d7b925e360d436863f66"}, + {file = "regex-2024.7.24-cp310-cp310-win_amd64.whl", hash = "sha256:6b9fc7e9cc983e75e2518496ba1afc524227c163e43d706688a6bb9eca41617e"}, + {file = "regex-2024.7.24-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:382281306e3adaaa7b8b9ebbb3ffb43358a7bbf585fa93821300a418bb975281"}, + {file = "regex-2024.7.24-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4fdd1384619f406ad9037fe6b6eaa3de2749e2e12084abc80169e8e075377d3b"}, + {file = "regex-2024.7.24-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3d974d24edb231446f708c455fd08f94c41c1ff4f04bcf06e5f36df5ef50b95a"}, + {file = "regex-2024.7.24-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a2ec4419a3fe6cf8a4795752596dfe0adb4aea40d3683a132bae9c30b81e8d73"}, + {file = "regex-2024.7.24-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eb563dd3aea54c797adf513eeec819c4213d7dbfc311874eb4fd28d10f2ff0f2"}, + {file = "regex-2024.7.24-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:45104baae8b9f67569f0f1dca5e1f1ed77a54ae1cd8b0b07aba89272710db61e"}, + {file = "regex-2024.7.24-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:994448ee01864501912abf2bad9203bffc34158e80fe8bfb5b031f4f8e16da51"}, + {file = "regex-2024.7.24-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3fac296f99283ac232d8125be932c5cd7644084a30748fda013028c815ba3364"}, + {file = "regex-2024.7.24-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:7e37e809b9303ec3a179085415cb5f418ecf65ec98cdfe34f6a078b46ef823ee"}, + {file = "regex-2024.7.24-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:01b689e887f612610c869421241e075c02f2e3d1ae93a037cb14f88ab6a8934c"}, + {file = "regex-2024.7.24-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:f6442f0f0ff81775eaa5b05af8a0ffa1dda36e9cf6ec1e0d3d245e8564b684ce"}, + {file = "regex-2024.7.24-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:871e3ab2838fbcb4e0865a6e01233975df3a15e6fce93b6f99d75cacbd9862d1"}, + {file = "regex-2024.7.24-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:c918b7a1e26b4ab40409820ddccc5d49871a82329640f5005f73572d5eaa9b5e"}, + {file = "regex-2024.7.24-cp311-cp311-win32.whl", hash = "sha256:2dfbb8baf8ba2c2b9aa2807f44ed272f0913eeeba002478c4577b8d29cde215c"}, + {file = "regex-2024.7.24-cp311-cp311-win_amd64.whl", hash = "sha256:538d30cd96ed7d1416d3956f94d54e426a8daf7c14527f6e0d6d425fcb4cca52"}, + {file = "regex-2024.7.24-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:fe4ebef608553aff8deb845c7f4f1d0740ff76fa672c011cc0bacb2a00fbde86"}, + {file = "regex-2024.7.24-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:74007a5b25b7a678459f06559504f1eec2f0f17bca218c9d56f6a0a12bfffdad"}, + {file = "regex-2024.7.24-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:7df9ea48641da022c2a3c9c641650cd09f0cd15e8908bf931ad538f5ca7919c9"}, + {file = "regex-2024.7.24-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6a1141a1dcc32904c47f6846b040275c6e5de0bf73f17d7a409035d55b76f289"}, + {file = "regex-2024.7.24-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:80c811cfcb5c331237d9bad3bea2c391114588cf4131707e84d9493064d267f9"}, + {file = "regex-2024.7.24-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7214477bf9bd195894cf24005b1e7b496f46833337b5dedb7b2a6e33f66d962c"}, + {file = "regex-2024.7.24-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d55588cba7553f0b6ec33130bc3e114b355570b45785cebdc9daed8c637dd440"}, + {file = "regex-2024.7.24-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:558a57cfc32adcf19d3f791f62b5ff564922942e389e3cfdb538a23d65a6b610"}, + {file = "regex-2024.7.24-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:a512eed9dfd4117110b1881ba9a59b31433caed0c4101b361f768e7bcbaf93c5"}, + {file = "regex-2024.7.24-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:86b17ba823ea76256b1885652e3a141a99a5c4422f4a869189db328321b73799"}, + {file = "regex-2024.7.24-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:5eefee9bfe23f6df09ffb6dfb23809f4d74a78acef004aa904dc7c88b9944b05"}, + {file = "regex-2024.7.24-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:731fcd76bbdbf225e2eb85b7c38da9633ad3073822f5ab32379381e8c3c12e94"}, + {file = "regex-2024.7.24-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:eaef80eac3b4cfbdd6de53c6e108b4c534c21ae055d1dbea2de6b3b8ff3def38"}, + {file = "regex-2024.7.24-cp312-cp312-win32.whl", hash = "sha256:185e029368d6f89f36e526764cf12bf8d6f0e3a2a7737da625a76f594bdfcbfc"}, + {file = "regex-2024.7.24-cp312-cp312-win_amd64.whl", hash = "sha256:2f1baff13cc2521bea83ab2528e7a80cbe0ebb2c6f0bfad15be7da3aed443908"}, + {file = "regex-2024.7.24-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:66b4c0731a5c81921e938dcf1a88e978264e26e6ac4ec96a4d21ae0354581ae0"}, + {file = "regex-2024.7.24-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:88ecc3afd7e776967fa16c80f974cb79399ee8dc6c96423321d6f7d4b881c92b"}, + {file = "regex-2024.7.24-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:64bd50cf16bcc54b274e20235bf8edbb64184a30e1e53873ff8d444e7ac656b2"}, + {file = "regex-2024.7.24-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eb462f0e346fcf41a901a126b50f8781e9a474d3927930f3490f38a6e73b6950"}, + {file = "regex-2024.7.24-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a82465ebbc9b1c5c50738536fdfa7cab639a261a99b469c9d4c7dcbb2b3f1e57"}, + {file = "regex-2024.7.24-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:68a8f8c046c6466ac61a36b65bb2395c74451df2ffb8458492ef49900efed293"}, + {file = "regex-2024.7.24-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dac8e84fff5d27420f3c1e879ce9929108e873667ec87e0c8eeb413a5311adfe"}, + {file = "regex-2024.7.24-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ba2537ef2163db9e6ccdbeb6f6424282ae4dea43177402152c67ef869cf3978b"}, + {file = "regex-2024.7.24-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:43affe33137fcd679bdae93fb25924979517e011f9dea99163f80b82eadc7e53"}, + {file = "regex-2024.7.24-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:c9bb87fdf2ab2370f21e4d5636e5317775e5d51ff32ebff2cf389f71b9b13750"}, + {file = "regex-2024.7.24-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:945352286a541406f99b2655c973852da7911b3f4264e010218bbc1cc73168f2"}, + {file = "regex-2024.7.24-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:8bc593dcce679206b60a538c302d03c29b18e3d862609317cb560e18b66d10cf"}, + {file = "regex-2024.7.24-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:3f3b6ca8eae6d6c75a6cff525c8530c60e909a71a15e1b731723233331de4169"}, + {file = "regex-2024.7.24-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:c51edc3541e11fbe83f0c4d9412ef6c79f664a3745fab261457e84465ec9d5a8"}, + {file = "regex-2024.7.24-cp38-cp38-win32.whl", hash = "sha256:d0a07763776188b4db4c9c7fb1b8c494049f84659bb387b71c73bbc07f189e96"}, + {file = "regex-2024.7.24-cp38-cp38-win_amd64.whl", hash = "sha256:8fd5afd101dcf86a270d254364e0e8dddedebe6bd1ab9d5f732f274fa00499a5"}, + {file = "regex-2024.7.24-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:0ffe3f9d430cd37d8fa5632ff6fb36d5b24818c5c986893063b4e5bdb84cdf24"}, + {file = "regex-2024.7.24-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:25419b70ba00a16abc90ee5fce061228206173231f004437730b67ac77323f0d"}, + {file = "regex-2024.7.24-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:33e2614a7ce627f0cdf2ad104797d1f68342d967de3695678c0cb84f530709f8"}, + {file = "regex-2024.7.24-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d33a0021893ede5969876052796165bab6006559ab845fd7b515a30abdd990dc"}, + {file = "regex-2024.7.24-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:04ce29e2c5fedf296b1a1b0acc1724ba93a36fb14031f3abfb7abda2806c1535"}, + {file = "regex-2024.7.24-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b16582783f44fbca6fcf46f61347340c787d7530d88b4d590a397a47583f31dd"}, + {file = "regex-2024.7.24-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:836d3cc225b3e8a943d0b02633fb2f28a66e281290302a79df0e1eaa984ff7c1"}, + {file = "regex-2024.7.24-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:438d9f0f4bc64e8dea78274caa5af971ceff0f8771e1a2333620969936ba10be"}, + {file = "regex-2024.7.24-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:973335b1624859cb0e52f96062a28aa18f3a5fc77a96e4a3d6d76e29811a0e6e"}, + {file = "regex-2024.7.24-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:c5e69fd3eb0b409432b537fe3c6f44ac089c458ab6b78dcec14478422879ec5f"}, + {file = "regex-2024.7.24-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:fbf8c2f00904eaf63ff37718eb13acf8e178cb940520e47b2f05027f5bb34ce3"}, + {file = "regex-2024.7.24-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:ae2757ace61bc4061b69af19e4689fa4416e1a04840f33b441034202b5cd02d4"}, + {file = "regex-2024.7.24-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:44fc61b99035fd9b3b9453f1713234e5a7c92a04f3577252b45feefe1b327759"}, + {file = "regex-2024.7.24-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:84c312cdf839e8b579f504afcd7b65f35d60b6285d892b19adea16355e8343c9"}, + {file = "regex-2024.7.24-cp39-cp39-win32.whl", hash = "sha256:ca5b2028c2f7af4e13fb9fc29b28d0ce767c38c7facdf64f6c2cd040413055f1"}, + {file = "regex-2024.7.24-cp39-cp39-win_amd64.whl", hash = "sha256:7c479f5ae937ec9985ecaf42e2e10631551d909f203e31308c12d703922742f9"}, + {file = "regex-2024.7.24.tar.gz", hash = "sha256:9cfd009eed1a46b27c14039ad5bbc5e71b6367c5b2e6d5f5da0ea91600817506"}, ] [[package]] name = "requests" -version = "2.31.0" +version = "2.32.3" description = "Python HTTP for Humans." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"}, - {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"}, + {file = "requests-2.32.3-py3-none-any.whl", hash = "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"}, + {file = "requests-2.32.3.tar.gz", hash = "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760"}, ] [package.dependencies] @@ -2071,94 +1376,20 @@ socks = ["PySocks (>=1.5.6,!=1.5.7)"] use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] [[package]] -name = "scikit-image" -version = "0.24.0" -description = "Image processing in Python" -optional = false -python-versions = ">=3.9" -files = [ - {file = "scikit_image-0.24.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:cb3bc0264b6ab30b43c4179ee6156bc18b4861e78bb329dd8d16537b7bbf827a"}, - {file = "scikit_image-0.24.0-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:9c7a52e20cdd760738da38564ba1fed7942b623c0317489af1a598a8dedf088b"}, - {file = "scikit_image-0.24.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:93f46e6ce42e5409f4d09ce1b0c7f80dd7e4373bcec635b6348b63e3c886eac8"}, - {file = "scikit_image-0.24.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:39ee0af13435c57351a3397eb379e72164ff85161923eec0c38849fecf1b4764"}, - {file = "scikit_image-0.24.0-cp310-cp310-win_amd64.whl", hash = "sha256:7ac7913b028b8aa780ffae85922894a69e33d1c0bf270ea1774f382fe8bf95e7"}, - {file = "scikit_image-0.24.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:272909e02a59cea3ed4aa03739bb88df2625daa809f633f40b5053cf09241831"}, - {file = "scikit_image-0.24.0-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:190ebde80b4470fe8838764b9b15f232a964f1a20391663e31008d76f0c696f7"}, - {file = "scikit_image-0.24.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:59c98cc695005faf2b79904e4663796c977af22586ddf1b12d6af2fa22842dc2"}, - {file = "scikit_image-0.24.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fa27b3a0dbad807b966b8db2d78da734cb812ca4787f7fbb143764800ce2fa9c"}, - {file = "scikit_image-0.24.0-cp311-cp311-win_amd64.whl", hash = "sha256:dacf591ac0c272a111181afad4b788a27fe70d213cfddd631d151cbc34f8ca2c"}, - {file = "scikit_image-0.24.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:6fccceb54c9574590abcddc8caf6cefa57c13b5b8b4260ab3ff88ad8f3c252b3"}, - {file = "scikit_image-0.24.0-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:ccc01e4760d655aab7601c1ba7aa4ddd8b46f494ac46ec9c268df6f33ccddf4c"}, - {file = "scikit_image-0.24.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18836a18d3a7b6aca5376a2d805f0045826bc6c9fc85331659c33b4813e0b563"}, - {file = "scikit_image-0.24.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8579bda9c3f78cb3b3ed8b9425213c53a25fa7e994b7ac01f2440b395babf660"}, - {file = "scikit_image-0.24.0-cp312-cp312-win_amd64.whl", hash = "sha256:82ab903afa60b2da1da2e6f0c8c65e7c8868c60a869464c41971da929b3e82bc"}, - {file = "scikit_image-0.24.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:ef04360eda372ee5cd60aebe9be91258639c86ae2ea24093fb9182118008d009"}, - {file = "scikit_image-0.24.0-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:e9aadb442360a7e76f0c5c9d105f79a83d6df0e01e431bd1d5757e2c5871a1f3"}, - {file = "scikit_image-0.24.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e37de6f4c1abcf794e13c258dc9b7d385d5be868441de11c180363824192ff7"}, - {file = "scikit_image-0.24.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4688c18bd7ec33c08d7bf0fd19549be246d90d5f2c1d795a89986629af0a1e83"}, - {file = "scikit_image-0.24.0-cp39-cp39-win_amd64.whl", hash = "sha256:56dab751d20b25d5d3985e95c9b4e975f55573554bd76b0aedf5875217c93e69"}, - {file = "scikit_image-0.24.0.tar.gz", hash = "sha256:5d16efe95da8edbeb363e0c4157b99becbd650a60b77f6e3af5768b66cf007ab"}, -] - -[package.dependencies] -imageio = ">=2.33" -lazy-loader = ">=0.4" -networkx = ">=2.8" -numpy = ">=1.23" -packaging = ">=21" -pillow = ">=9.1" -scipy = ">=1.9" -tifffile = ">=2022.8.12" - -[package.extras] -build = ["Cython (>=3.0.4)", "build", "meson-python (>=0.15)", "ninja", "numpy (>=2.0.0rc1)", "packaging (>=21)", "pythran", "setuptools (>=67)", "spin (==0.8)", "wheel"] -data = ["pooch (>=1.6.0)"] -developer = ["ipython", "pre-commit", "tomli"] -docs = ["PyWavelets (>=1.1.1)", "dask[array] (>=2022.9.2)", "ipykernel", "ipywidgets", "kaleido", "matplotlib (>=3.6)", "myst-parser", "numpydoc (>=1.7)", "pandas (>=1.5)", "plotly (>=5.10)", "pooch (>=1.6)", "pydata-sphinx-theme (>=0.15.2)", "pytest-doctestplus", "pytest-runner", "scikit-learn (>=1.1)", "seaborn (>=0.11)", "sphinx (>=7.3)", "sphinx-copybutton", "sphinx-gallery (>=0.14)", "sphinx_design (>=0.5)", "tifffile (>=2022.8.12)"] -optional = ["PyWavelets (>=1.1.1)", "SimpleITK", "astropy (>=5.0)", "cloudpickle (>=0.2.1)", "dask[array] (>=2021.1.0)", "matplotlib (>=3.6)", "pooch (>=1.6.0)", "pyamg", "scikit-learn (>=1.1)"] -test = ["asv", "numpydoc (>=1.7)", "pooch (>=1.6.0)", "pytest (>=7.0)", "pytest-cov (>=2.11.0)", "pytest-doctestplus", "pytest-faulthandler", "pytest-localserver"] - -[[package]] -name = "scipy" -version = "1.14.0" -description = "Fundamental algorithms for scientific computing in Python" +name = "setuptools" +version = "72.1.0" +description = "Easily download, build, install, upgrade, and uninstall Python packages" optional = false -python-versions = ">=3.10" +python-versions = ">=3.8" files = [ - {file = "scipy-1.14.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7e911933d54ead4d557c02402710c2396529540b81dd554fc1ba270eb7308484"}, - {file = "scipy-1.14.0-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:687af0a35462402dd851726295c1a5ae5f987bd6e9026f52e9505994e2f84ef6"}, - {file = "scipy-1.14.0-cp310-cp310-macosx_14_0_arm64.whl", hash = "sha256:07e179dc0205a50721022344fb85074f772eadbda1e1b3eecdc483f8033709b7"}, - {file = "scipy-1.14.0-cp310-cp310-macosx_14_0_x86_64.whl", hash = "sha256:6a9c9a9b226d9a21e0a208bdb024c3982932e43811b62d202aaf1bb59af264b1"}, - {file = "scipy-1.14.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:076c27284c768b84a45dcf2e914d4000aac537da74236a0d45d82c6fa4b7b3c0"}, - {file = "scipy-1.14.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:42470ea0195336df319741e230626b6225a740fd9dce9642ca13e98f667047c0"}, - {file = "scipy-1.14.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:176c6f0d0470a32f1b2efaf40c3d37a24876cebf447498a4cefb947a79c21e9d"}, - {file = "scipy-1.14.0-cp310-cp310-win_amd64.whl", hash = "sha256:ad36af9626d27a4326c8e884917b7ec321d8a1841cd6dacc67d2a9e90c2f0359"}, - {file = "scipy-1.14.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6d056a8709ccda6cf36cdd2eac597d13bc03dba38360f418560a93050c76a16e"}, - {file = "scipy-1.14.0-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:f0a50da861a7ec4573b7c716b2ebdcdf142b66b756a0d392c236ae568b3a93fb"}, - {file = "scipy-1.14.0-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:94c164a9e2498e68308e6e148646e486d979f7fcdb8b4cf34b5441894bdb9caf"}, - {file = "scipy-1.14.0-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:a7d46c3e0aea5c064e734c3eac5cf9eb1f8c4ceee756262f2c7327c4c2691c86"}, - {file = "scipy-1.14.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9eee2989868e274aae26125345584254d97c56194c072ed96cb433f32f692ed8"}, - {file = "scipy-1.14.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9e3154691b9f7ed73778d746da2df67a19d046a6c8087c8b385bc4cdb2cfca74"}, - {file = "scipy-1.14.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:c40003d880f39c11c1edbae8144e3813904b10514cd3d3d00c277ae996488cdb"}, - {file = "scipy-1.14.0-cp311-cp311-win_amd64.whl", hash = "sha256:5b083c8940028bb7e0b4172acafda6df762da1927b9091f9611b0bcd8676f2bc"}, - {file = "scipy-1.14.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:bff2438ea1330e06e53c424893ec0072640dac00f29c6a43a575cbae4c99b2b9"}, - {file = "scipy-1.14.0-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:bbc0471b5f22c11c389075d091d3885693fd3f5e9a54ce051b46308bc787e5d4"}, - {file = "scipy-1.14.0-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:64b2ff514a98cf2bb734a9f90d32dc89dc6ad4a4a36a312cd0d6327170339eb0"}, - {file = "scipy-1.14.0-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:7d3da42fbbbb860211a811782504f38ae7aaec9de8764a9bef6b262de7a2b50f"}, - {file = "scipy-1.14.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d91db2c41dd6c20646af280355d41dfa1ec7eead235642178bd57635a3f82209"}, - {file = "scipy-1.14.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a01cc03bcdc777c9da3cfdcc74b5a75caffb48a6c39c8450a9a05f82c4250a14"}, - {file = "scipy-1.14.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:65df4da3c12a2bb9ad52b86b4dcf46813e869afb006e58be0f516bc370165159"}, - {file = "scipy-1.14.0-cp312-cp312-win_amd64.whl", hash = "sha256:4c4161597c75043f7154238ef419c29a64ac4a7c889d588ea77690ac4d0d9b20"}, - {file = "scipy-1.14.0.tar.gz", hash = "sha256:b5923f48cb840380f9854339176ef21763118a7300a88203ccd0bdd26e58527b"}, + {file = "setuptools-72.1.0-py3-none-any.whl", hash = "sha256:5a03e1860cf56bb6ef48ce186b0e557fdba433237481a9a625176c2831be15d1"}, + {file = "setuptools-72.1.0.tar.gz", hash = "sha256:8d243eff56d095e5817f796ede6ae32941278f542e0f941867cc05ae52b162ec"}, ] -[package.dependencies] -numpy = ">=1.23.5,<2.3" - [package.extras] -dev = ["cython-lint (>=0.12.2)", "doit (>=0.36.0)", "mypy (==1.10.0)", "pycodestyle", "pydevtool", "rich-click", "ruff (>=0.0.292)", "types-psutil", "typing_extensions"] -doc = ["jupyterlite-pyodide-kernel", "jupyterlite-sphinx (>=0.13.1)", "jupytext", "matplotlib (>=3.5)", "myst-nb", "numpydoc", "pooch", "pydata-sphinx-theme (>=0.15.2)", "sphinx (>=5.0.0)", "sphinx-design (>=0.4.0)"] -test = ["Cython", "array-api-strict", "asv", "gmpy2", "hypothesis (>=6.30)", "meson", "mpmath", "ninja", "pooch", "pytest", "pytest-cov", "pytest-timeout", "pytest-xdist", "scikit-umfpack", "threadpoolctl"] +core = ["importlib-metadata (>=6)", "importlib-resources (>=5.10.2)", "jaraco.text (>=3.7)", "more-itertools (>=8.8)", "ordered-set (>=3.1.1)", "packaging (>=24)", "platformdirs (>=2.6.2)", "tomli (>=2.0.1)", "wheel (>=0.43.0)"] +doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"] +test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "importlib-metadata", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test", "mypy (==1.11.*)", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-home (>=0.5)", "pytest-mypy", "pytest-perf", "pytest-ruff (<0.4)", "pytest-ruff (>=0.2.1)", "pytest-ruff (>=0.3.2)", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] [[package]] name = "simpleitk" @@ -2205,34 +1436,15 @@ files = [ {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, ] -[[package]] -name = "stack-data" -version = "0.6.3" -description = "Extract data from python stack frames and tracebacks for informative displays" -optional = false -python-versions = "*" -files = [ - {file = "stack_data-0.6.3-py3-none-any.whl", hash = "sha256:d5558e0c25a4cb0853cddad3d77da9891a08cb85dd9f9f91b9f8cd66e511e695"}, - {file = "stack_data-0.6.3.tar.gz", hash = "sha256:836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9"}, -] - -[package.dependencies] -asttokens = ">=2.1.0" -executing = ">=1.2.0" -pure-eval = "*" - -[package.extras] -tests = ["cython", "littleutils", "pygments", "pytest", "typeguard"] - [[package]] name = "tifffile" -version = "2024.6.18" +version = "2024.7.24" description = "Read and write TIFF files" optional = false python-versions = ">=3.9" files = [ - {file = "tifffile-2024.6.18-py3-none-any.whl", hash = "sha256:67299c0445fc47463bbc71f3cb4676da2ab0242b0c6c6542a0680801b4b97d8a"}, - {file = "tifffile-2024.6.18.tar.gz", hash = "sha256:57e0d2a034bcb6287ea3155d8716508dfac86443a257f6502b57ee7f8a33b3b6"}, + {file = "tifffile-2024.7.24-py3-none-any.whl", hash = "sha256:f5cce1a915c37bc44ae4a792e3b42c07a30a3fa88406f5c6060a3de076487ed1"}, + {file = "tifffile-2024.7.24.tar.gz", hash = "sha256:723456ebf2b4918878ae05a7b50fa366ff3b3a686293317eb7a0f294c3eea050"}, ] [package.dependencies] @@ -2240,73 +1452,45 @@ numpy = "*" [package.extras] all = ["defusedxml", "fsspec", "imagecodecs (>=2023.8.12)", "lxml", "matplotlib", "zarr"] +codecs = ["imagecodecs (>=2023.8.12)"] +plot = ["matplotlib"] +xml = ["defusedxml", "lxml"] +zarr = ["fsspec", "zarr"] [[package]] -name = "tomli" -version = "2.0.1" -description = "A lil' TOML parser" -optional = false -python-versions = ">=3.7" -files = [ - {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, - {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, -] - -[[package]] -name = "tornado" -version = "6.4" -description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed." -optional = false -python-versions = ">= 3.8" -files = [ - {file = "tornado-6.4-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:02ccefc7d8211e5a7f9e8bc3f9e5b0ad6262ba2fbb683a6443ecc804e5224ce0"}, - {file = "tornado-6.4-cp38-abi3-macosx_10_9_x86_64.whl", hash = "sha256:27787de946a9cffd63ce5814c33f734c627a87072ec7eed71f7fc4417bb16263"}, - {file = "tornado-6.4-cp38-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f7894c581ecdcf91666a0912f18ce5e757213999e183ebfc2c3fdbf4d5bd764e"}, - {file = "tornado-6.4-cp38-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e43bc2e5370a6a8e413e1e1cd0c91bedc5bd62a74a532371042a18ef19e10579"}, - {file = "tornado-6.4-cp38-abi3-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f0251554cdd50b4b44362f73ad5ba7126fc5b2c2895cc62b14a1c2d7ea32f212"}, - {file = "tornado-6.4-cp38-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:fd03192e287fbd0899dd8f81c6fb9cbbc69194d2074b38f384cb6fa72b80e9c2"}, - {file = "tornado-6.4-cp38-abi3-musllinux_1_1_i686.whl", hash = "sha256:88b84956273fbd73420e6d4b8d5ccbe913c65d31351b4c004ae362eba06e1f78"}, - {file = "tornado-6.4-cp38-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:71ddfc23a0e03ef2df1c1397d859868d158c8276a0603b96cf86892bff58149f"}, - {file = "tornado-6.4-cp38-abi3-win32.whl", hash = "sha256:6f8a6c77900f5ae93d8b4ae1196472d0ccc2775cc1dfdc9e7727889145c45052"}, - {file = "tornado-6.4-cp38-abi3-win_amd64.whl", hash = "sha256:10aeaa8006333433da48dec9fe417877f8bcc21f48dda8d661ae79da357b2a63"}, - {file = "tornado-6.4.tar.gz", hash = "sha256:72291fa6e6bc84e626589f1c29d90a5a6d593ef5ae68052ee2ef000dfd273dee"}, -] - -[[package]] -name = "traitlets" -version = "5.14.3" -description = "Traitlets Python configuration system" +name = "tomlkit" +version = "0.13.0" +description = "Style preserving TOML library" optional = false python-versions = ">=3.8" files = [ - {file = "traitlets-5.14.3-py3-none-any.whl", hash = "sha256:b74e89e397b1ed28cc831db7aea759ba6640cb3de13090ca145426688ff1ac4f"}, - {file = "traitlets-5.14.3.tar.gz", hash = "sha256:9ed0579d3502c94b4b3732ac120375cda96f923114522847de4b3bb98b96b6b7"}, + {file = "tomlkit-0.13.0-py3-none-any.whl", hash = "sha256:7075d3042d03b80f603482d69bf0c8f345c2b30e41699fd8883227f89972b264"}, + {file = "tomlkit-0.13.0.tar.gz", hash = "sha256:08ad192699734149f5b97b45f1f18dad7eb1b6d16bc72ad0c2335772650d7b72"}, ] -[package.extras] -docs = ["myst-parser", "pydata-sphinx-theme", "sphinx"] -test = ["argcomplete (>=3.0.3)", "mypy (>=1.7.0)", "pre-commit", "pytest (>=7.0,<8.2)", "pytest-mock", "pytest-mypy-testing"] - [[package]] -name = "typing-extensions" -version = "4.11.0" -description = "Backported and Experimental Type Hints for Python 3.8+" +name = "transforms3d" +version = "0.4.2" +description = "Functions for 3D coordinate transformations" optional = false -python-versions = ">=3.8" +python-versions = ">=3.6" files = [ - {file = "typing_extensions-4.11.0-py3-none-any.whl", hash = "sha256:c1f94d72897edaf4ce775bb7558d5b79d8126906a14ea5ed1635921406c0387a"}, - {file = "typing_extensions-4.11.0.tar.gz", hash = "sha256:83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0"}, + {file = "transforms3d-0.4.2-py3-none-any.whl", hash = "sha256:1c70399d9e9473ecc23311fd947f727f7c69ed0b063244828c383aa1aefa5941"}, + {file = "transforms3d-0.4.2.tar.gz", hash = "sha256:e8b5df30eaedbee556e81c6938e55aab5365894e47d0a17615d7db7fd2393680"}, ] +[package.dependencies] +numpy = ">=1.15" + [[package]] name = "urllib3" -version = "2.2.1" +version = "2.2.2" description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false python-versions = ">=3.8" files = [ - {file = "urllib3-2.2.1-py3-none-any.whl", hash = "sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d"}, - {file = "urllib3-2.2.1.tar.gz", hash = "sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19"}, + {file = "urllib3-2.2.2-py3-none-any.whl", hash = "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472"}, + {file = "urllib3-2.2.2.tar.gz", hash = "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"}, ] [package.extras] @@ -2331,124 +1515,167 @@ test = ["coverage", "flake8 (>=3.7)", "mypy", "pretend", "pytest"] [[package]] name = "watchdog" -version = "4.0.0" +version = "4.0.1" description = "Filesystem events monitoring" optional = false python-versions = ">=3.8" files = [ - {file = "watchdog-4.0.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:39cb34b1f1afbf23e9562501673e7146777efe95da24fab5707b88f7fb11649b"}, - {file = "watchdog-4.0.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c522392acc5e962bcac3b22b9592493ffd06d1fc5d755954e6be9f4990de932b"}, - {file = "watchdog-4.0.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6c47bdd680009b11c9ac382163e05ca43baf4127954c5f6d0250e7d772d2b80c"}, - {file = "watchdog-4.0.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:8350d4055505412a426b6ad8c521bc7d367d1637a762c70fdd93a3a0d595990b"}, - {file = "watchdog-4.0.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c17d98799f32e3f55f181f19dd2021d762eb38fdd381b4a748b9f5a36738e935"}, - {file = "watchdog-4.0.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4986db5e8880b0e6b7cd52ba36255d4793bf5cdc95bd6264806c233173b1ec0b"}, - {file = "watchdog-4.0.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:11e12fafb13372e18ca1bbf12d50f593e7280646687463dd47730fd4f4d5d257"}, - {file = "watchdog-4.0.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:5369136a6474678e02426bd984466343924d1df8e2fd94a9b443cb7e3aa20d19"}, - {file = "watchdog-4.0.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:76ad8484379695f3fe46228962017a7e1337e9acadafed67eb20aabb175df98b"}, - {file = "watchdog-4.0.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:45cc09cc4c3b43fb10b59ef4d07318d9a3ecdbff03abd2e36e77b6dd9f9a5c85"}, - {file = "watchdog-4.0.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:eed82cdf79cd7f0232e2fdc1ad05b06a5e102a43e331f7d041e5f0e0a34a51c4"}, - {file = "watchdog-4.0.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:ba30a896166f0fee83183cec913298151b73164160d965af2e93a20bbd2ab605"}, - {file = "watchdog-4.0.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:d18d7f18a47de6863cd480734613502904611730f8def45fc52a5d97503e5101"}, - {file = "watchdog-4.0.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2895bf0518361a9728773083908801a376743bcc37dfa252b801af8fd281b1ca"}, - {file = "watchdog-4.0.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:87e9df830022488e235dd601478c15ad73a0389628588ba0b028cb74eb72fed8"}, - {file = "watchdog-4.0.0-pp310-pypy310_pp73-macosx_10_9_x86_64.whl", hash = "sha256:6e949a8a94186bced05b6508faa61b7adacc911115664ccb1923b9ad1f1ccf7b"}, - {file = "watchdog-4.0.0-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:6a4db54edea37d1058b08947c789a2354ee02972ed5d1e0dca9b0b820f4c7f92"}, - {file = "watchdog-4.0.0-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:d31481ccf4694a8416b681544c23bd271f5a123162ab603c7d7d2dd7dd901a07"}, - {file = "watchdog-4.0.0-py3-none-manylinux2014_aarch64.whl", hash = "sha256:8fec441f5adcf81dd240a5fe78e3d83767999771630b5ddfc5867827a34fa3d3"}, - {file = "watchdog-4.0.0-py3-none-manylinux2014_armv7l.whl", hash = "sha256:6a9c71a0b02985b4b0b6d14b875a6c86ddea2fdbebd0c9a720a806a8bbffc69f"}, - {file = "watchdog-4.0.0-py3-none-manylinux2014_i686.whl", hash = "sha256:557ba04c816d23ce98a06e70af6abaa0485f6d94994ec78a42b05d1c03dcbd50"}, - {file = "watchdog-4.0.0-py3-none-manylinux2014_ppc64.whl", hash = "sha256:d0f9bd1fd919134d459d8abf954f63886745f4660ef66480b9d753a7c9d40927"}, - {file = "watchdog-4.0.0-py3-none-manylinux2014_ppc64le.whl", hash = "sha256:f9b2fdca47dc855516b2d66eef3c39f2672cbf7e7a42e7e67ad2cbfcd6ba107d"}, - {file = "watchdog-4.0.0-py3-none-manylinux2014_s390x.whl", hash = "sha256:73c7a935e62033bd5e8f0da33a4dcb763da2361921a69a5a95aaf6c93aa03a87"}, - {file = "watchdog-4.0.0-py3-none-manylinux2014_x86_64.whl", hash = "sha256:6a80d5cae8c265842c7419c560b9961561556c4361b297b4c431903f8c33b269"}, - {file = "watchdog-4.0.0-py3-none-win32.whl", hash = "sha256:8f9a542c979df62098ae9c58b19e03ad3df1c9d8c6895d96c0d51da17b243b1c"}, - {file = "watchdog-4.0.0-py3-none-win_amd64.whl", hash = "sha256:f970663fa4f7e80401a7b0cbeec00fa801bf0287d93d48368fc3e6fa32716245"}, - {file = "watchdog-4.0.0-py3-none-win_ia64.whl", hash = "sha256:9a03e16e55465177d416699331b0f3564138f1807ecc5f2de9d55d8f188d08c7"}, - {file = "watchdog-4.0.0.tar.gz", hash = "sha256:e3e7065cbdabe6183ab82199d7a4f6b3ba0a438c5a512a68559846ccb76a78ec"}, + {file = "watchdog-4.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:da2dfdaa8006eb6a71051795856bedd97e5b03e57da96f98e375682c48850645"}, + {file = "watchdog-4.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e93f451f2dfa433d97765ca2634628b789b49ba8b504fdde5837cdcf25fdb53b"}, + {file = "watchdog-4.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ef0107bbb6a55f5be727cfc2ef945d5676b97bffb8425650dadbb184be9f9a2b"}, + {file = "watchdog-4.0.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:17e32f147d8bf9657e0922c0940bcde863b894cd871dbb694beb6704cfbd2fb5"}, + {file = "watchdog-4.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:03e70d2df2258fb6cb0e95bbdbe06c16e608af94a3ffbd2b90c3f1e83eb10767"}, + {file = "watchdog-4.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:123587af84260c991dc5f62a6e7ef3d1c57dfddc99faacee508c71d287248459"}, + {file = "watchdog-4.0.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:093b23e6906a8b97051191a4a0c73a77ecc958121d42346274c6af6520dec175"}, + {file = "watchdog-4.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:611be3904f9843f0529c35a3ff3fd617449463cb4b73b1633950b3d97fa4bfb7"}, + {file = "watchdog-4.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:62c613ad689ddcb11707f030e722fa929f322ef7e4f18f5335d2b73c61a85c28"}, + {file = "watchdog-4.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:d4925e4bf7b9bddd1c3de13c9b8a2cdb89a468f640e66fbfabaf735bd85b3e35"}, + {file = "watchdog-4.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:cad0bbd66cd59fc474b4a4376bc5ac3fc698723510cbb64091c2a793b18654db"}, + {file = "watchdog-4.0.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a3c2c317a8fb53e5b3d25790553796105501a235343f5d2bf23bb8649c2c8709"}, + {file = "watchdog-4.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c9904904b6564d4ee8a1ed820db76185a3c96e05560c776c79a6ce5ab71888ba"}, + {file = "watchdog-4.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:667f3c579e813fcbad1b784db7a1aaa96524bed53437e119f6a2f5de4db04235"}, + {file = "watchdog-4.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:d10a681c9a1d5a77e75c48a3b8e1a9f2ae2928eda463e8d33660437705659682"}, + {file = "watchdog-4.0.1-pp310-pypy310_pp73-macosx_10_9_x86_64.whl", hash = "sha256:0144c0ea9997b92615af1d94afc0c217e07ce2c14912c7b1a5731776329fcfc7"}, + {file = "watchdog-4.0.1-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:998d2be6976a0ee3a81fb8e2777900c28641fb5bfbd0c84717d89bca0addcdc5"}, + {file = "watchdog-4.0.1-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:e7921319fe4430b11278d924ef66d4daa469fafb1da679a2e48c935fa27af193"}, + {file = "watchdog-4.0.1-pp38-pypy38_pp73-macosx_11_0_arm64.whl", hash = "sha256:f0de0f284248ab40188f23380b03b59126d1479cd59940f2a34f8852db710625"}, + {file = "watchdog-4.0.1-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:bca36be5707e81b9e6ce3208d92d95540d4ca244c006b61511753583c81c70dd"}, + {file = "watchdog-4.0.1-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:ab998f567ebdf6b1da7dc1e5accfaa7c6992244629c0fdaef062f43249bd8dee"}, + {file = "watchdog-4.0.1-py3-none-manylinux2014_aarch64.whl", hash = "sha256:dddba7ca1c807045323b6af4ff80f5ddc4d654c8bce8317dde1bd96b128ed253"}, + {file = "watchdog-4.0.1-py3-none-manylinux2014_armv7l.whl", hash = "sha256:4513ec234c68b14d4161440e07f995f231be21a09329051e67a2118a7a612d2d"}, + {file = "watchdog-4.0.1-py3-none-manylinux2014_i686.whl", hash = "sha256:4107ac5ab936a63952dea2a46a734a23230aa2f6f9db1291bf171dac3ebd53c6"}, + {file = "watchdog-4.0.1-py3-none-manylinux2014_ppc64.whl", hash = "sha256:6e8c70d2cd745daec2a08734d9f63092b793ad97612470a0ee4cbb8f5f705c57"}, + {file = "watchdog-4.0.1-py3-none-manylinux2014_ppc64le.whl", hash = "sha256:f27279d060e2ab24c0aa98363ff906d2386aa6c4dc2f1a374655d4e02a6c5e5e"}, + {file = "watchdog-4.0.1-py3-none-manylinux2014_s390x.whl", hash = "sha256:f8affdf3c0f0466e69f5b3917cdd042f89c8c63aebdb9f7c078996f607cdb0f5"}, + {file = "watchdog-4.0.1-py3-none-manylinux2014_x86_64.whl", hash = "sha256:ac7041b385f04c047fcc2951dc001671dee1b7e0615cde772e84b01fbf68ee84"}, + {file = "watchdog-4.0.1-py3-none-win32.whl", hash = "sha256:206afc3d964f9a233e6ad34618ec60b9837d0582b500b63687e34011e15bb429"}, + {file = "watchdog-4.0.1-py3-none-win_amd64.whl", hash = "sha256:7577b3c43e5909623149f76b099ac49a1a01ca4e167d1785c76eb52fa585745a"}, + {file = "watchdog-4.0.1-py3-none-win_ia64.whl", hash = "sha256:d7b9f5f3299e8dd230880b6c55504a1f69cf1e4316275d1b215ebdd8187ec88d"}, + {file = "watchdog-4.0.1.tar.gz", hash = "sha256:eebaacf674fa25511e8867028d281e602ee6500045b57f43b08778082f7f8b44"}, ] [package.extras] watchmedo = ["PyYAML (>=3.10)"] -[[package]] -name = "wcwidth" -version = "0.2.13" -description = "Measures the displayed width of unicode strings in a terminal" -optional = false -python-versions = "*" -files = [ - {file = "wcwidth-0.2.13-py2.py3-none-any.whl", hash = "sha256:3da69048e4540d84af32131829ff948f1e022c1c6bdb8d6102117aac784f6859"}, - {file = "wcwidth-0.2.13.tar.gz", hash = "sha256:72ea0c06399eb286d978fdedb6923a9eb47e1c486ce63e9b4e64fc18303972b5"}, -] - [[package]] name = "zipp" -version = "3.18.1" +version = "3.19.2" description = "Backport of pathlib-compatible object wrapper for zip files" optional = false python-versions = ">=3.8" files = [ - {file = "zipp-3.18.1-py3-none-any.whl", hash = "sha256:206f5a15f2af3dbaee80769fb7dc6f249695e940acca08dfb2a4769fe61e538b"}, - {file = "zipp-3.18.1.tar.gz", hash = "sha256:2884ed22e7d8961de1c9a05142eb69a247f120291bc0206a00a7642f09b5b715"}, + {file = "zipp-3.19.2-py3-none-any.whl", hash = "sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c"}, + {file = "zipp-3.19.2.tar.gz", hash = "sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19"}, ] [package.extras] -docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy", "pytest-ruff (>=0.2.1)"] +doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy", "pytest-ruff (>=0.2.1)"] [[package]] name = "zstandard" -version = "0.22.0" +version = "0.23.0" description = "Zstandard bindings for Python" optional = false python-versions = ">=3.8" files = [ - {file = "zstandard-0.22.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:275df437ab03f8c033b8a2c181e51716c32d831082d93ce48002a5227ec93019"}, - {file = "zstandard-0.22.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2ac9957bc6d2403c4772c890916bf181b2653640da98f32e04b96e4d6fb3252a"}, - {file = "zstandard-0.22.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fe3390c538f12437b859d815040763abc728955a52ca6ff9c5d4ac707c4ad98e"}, - {file = "zstandard-0.22.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1958100b8a1cc3f27fa21071a55cb2ed32e9e5df4c3c6e661c193437f171cba2"}, - {file = "zstandard-0.22.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:93e1856c8313bc688d5df069e106a4bc962eef3d13372020cc6e3ebf5e045202"}, - {file = "zstandard-0.22.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:1a90ba9a4c9c884bb876a14be2b1d216609385efb180393df40e5172e7ecf356"}, - {file = "zstandard-0.22.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:3db41c5e49ef73641d5111554e1d1d3af106410a6c1fb52cf68912ba7a343a0d"}, - {file = "zstandard-0.22.0-cp310-cp310-win32.whl", hash = "sha256:d8593f8464fb64d58e8cb0b905b272d40184eac9a18d83cf8c10749c3eafcd7e"}, - {file = "zstandard-0.22.0-cp310-cp310-win_amd64.whl", hash = "sha256:f1a4b358947a65b94e2501ce3e078bbc929b039ede4679ddb0460829b12f7375"}, - {file = "zstandard-0.22.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:589402548251056878d2e7c8859286eb91bd841af117dbe4ab000e6450987e08"}, - {file = "zstandard-0.22.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a97079b955b00b732c6f280d5023e0eefe359045e8b83b08cf0333af9ec78f26"}, - {file = "zstandard-0.22.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:445b47bc32de69d990ad0f34da0e20f535914623d1e506e74d6bc5c9dc40bb09"}, - {file = "zstandard-0.22.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:33591d59f4956c9812f8063eff2e2c0065bc02050837f152574069f5f9f17775"}, - {file = "zstandard-0.22.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:888196c9c8893a1e8ff5e89b8f894e7f4f0e64a5af4d8f3c410f0319128bb2f8"}, - {file = "zstandard-0.22.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:53866a9d8ab363271c9e80c7c2e9441814961d47f88c9bc3b248142c32141d94"}, - {file = "zstandard-0.22.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:4ac59d5d6910b220141c1737b79d4a5aa9e57466e7469a012ed42ce2d3995e88"}, - {file = "zstandard-0.22.0-cp311-cp311-win32.whl", hash = "sha256:2b11ea433db22e720758cba584c9d661077121fcf60ab43351950ded20283440"}, - {file = "zstandard-0.22.0-cp311-cp311-win_amd64.whl", hash = "sha256:11f0d1aab9516a497137b41e3d3ed4bbf7b2ee2abc79e5c8b010ad286d7464bd"}, - {file = "zstandard-0.22.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:6c25b8eb733d4e741246151d895dd0308137532737f337411160ff69ca24f93a"}, - {file = "zstandard-0.22.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f9b2cde1cd1b2a10246dbc143ba49d942d14fb3d2b4bccf4618d475c65464912"}, - {file = "zstandard-0.22.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a88b7df61a292603e7cd662d92565d915796b094ffb3d206579aaebac6b85d5f"}, - {file = "zstandard-0.22.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:466e6ad8caefb589ed281c076deb6f0cd330e8bc13c5035854ffb9c2014b118c"}, - {file = "zstandard-0.22.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a1d67d0d53d2a138f9e29d8acdabe11310c185e36f0a848efa104d4e40b808e4"}, - {file = "zstandard-0.22.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:39b2853efc9403927f9065cc48c9980649462acbdf81cd4f0cb773af2fd734bc"}, - {file = "zstandard-0.22.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8a1b2effa96a5f019e72874969394edd393e2fbd6414a8208fea363a22803b45"}, - {file = "zstandard-0.22.0-cp312-cp312-win32.whl", hash = "sha256:88c5b4b47a8a138338a07fc94e2ba3b1535f69247670abfe422de4e0b344aae2"}, - {file = "zstandard-0.22.0-cp312-cp312-win_amd64.whl", hash = "sha256:de20a212ef3d00d609d0b22eb7cc798d5a69035e81839f549b538eff4105d01c"}, - {file = "zstandard-0.22.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d75f693bb4e92c335e0645e8845e553cd09dc91616412d1d4650da835b5449df"}, - {file = "zstandard-0.22.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:36a47636c3de227cd765e25a21dc5dace00539b82ddd99ee36abae38178eff9e"}, - {file = "zstandard-0.22.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68953dc84b244b053c0d5f137a21ae8287ecf51b20872eccf8eaac0302d3e3b0"}, - {file = "zstandard-0.22.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2612e9bb4977381184bb2463150336d0f7e014d6bb5d4a370f9a372d21916f69"}, - {file = "zstandard-0.22.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:23d2b3c2b8e7e5a6cb7922f7c27d73a9a615f0a5ab5d0e03dd533c477de23004"}, - {file = "zstandard-0.22.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:1d43501f5f31e22baf822720d82b5547f8a08f5386a883b32584a185675c8fbf"}, - {file = "zstandard-0.22.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:a493d470183ee620a3df1e6e55b3e4de8143c0ba1b16f3ded83208ea8ddfd91d"}, - {file = "zstandard-0.22.0-cp38-cp38-win32.whl", hash = "sha256:7034d381789f45576ec3f1fa0e15d741828146439228dc3f7c59856c5bcd3292"}, - {file = "zstandard-0.22.0-cp38-cp38-win_amd64.whl", hash = "sha256:d8fff0f0c1d8bc5d866762ae95bd99d53282337af1be9dc0d88506b340e74b73"}, - {file = "zstandard-0.22.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2fdd53b806786bd6112d97c1f1e7841e5e4daa06810ab4b284026a1a0e484c0b"}, - {file = "zstandard-0.22.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:73a1d6bd01961e9fd447162e137ed949c01bdb830dfca487c4a14e9742dccc93"}, - {file = "zstandard-0.22.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9501f36fac6b875c124243a379267d879262480bf85b1dbda61f5ad4d01b75a3"}, - {file = "zstandard-0.22.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:48f260e4c7294ef275744210a4010f116048e0c95857befb7462e033f09442fe"}, - {file = "zstandard-0.22.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:959665072bd60f45c5b6b5d711f15bdefc9849dd5da9fb6c873e35f5d34d8cfb"}, - {file = "zstandard-0.22.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:d22fdef58976457c65e2796e6730a3ea4a254f3ba83777ecfc8592ff8d77d303"}, - {file = "zstandard-0.22.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a7ccf5825fd71d4542c8ab28d4d482aace885f5ebe4b40faaa290eed8e095a4c"}, - {file = "zstandard-0.22.0-cp39-cp39-win32.whl", hash = "sha256:f058a77ef0ece4e210bb0450e68408d4223f728b109764676e1a13537d056bb0"}, - {file = "zstandard-0.22.0-cp39-cp39-win_amd64.whl", hash = "sha256:e9e9d4e2e336c529d4c435baad846a181e39a982f823f7e4495ec0b0ec8538d2"}, - {file = "zstandard-0.22.0.tar.gz", hash = "sha256:8226a33c542bcb54cd6bd0a366067b610b41713b64c9abec1bc4533d69f51e70"}, + {file = "zstandard-0.23.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:bf0a05b6059c0528477fba9054d09179beb63744355cab9f38059548fedd46a9"}, + {file = "zstandard-0.23.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fc9ca1c9718cb3b06634c7c8dec57d24e9438b2aa9a0f02b8bb36bf478538880"}, + {file = "zstandard-0.23.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77da4c6bfa20dd5ea25cbf12c76f181a8e8cd7ea231c673828d0386b1740b8dc"}, + {file = "zstandard-0.23.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b2170c7e0367dde86a2647ed5b6f57394ea7f53545746104c6b09fc1f4223573"}, + {file = "zstandard-0.23.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c16842b846a8d2a145223f520b7e18b57c8f476924bda92aeee3a88d11cfc391"}, + {file = "zstandard-0.23.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:157e89ceb4054029a289fb504c98c6a9fe8010f1680de0201b3eb5dc20aa6d9e"}, + {file = "zstandard-0.23.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:203d236f4c94cd8379d1ea61db2fce20730b4c38d7f1c34506a31b34edc87bdd"}, + {file = "zstandard-0.23.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:dc5d1a49d3f8262be192589a4b72f0d03b72dcf46c51ad5852a4fdc67be7b9e4"}, + {file = "zstandard-0.23.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:752bf8a74412b9892f4e5b58f2f890a039f57037f52c89a740757ebd807f33ea"}, + {file = "zstandard-0.23.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:80080816b4f52a9d886e67f1f96912891074903238fe54f2de8b786f86baded2"}, + {file = "zstandard-0.23.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:84433dddea68571a6d6bd4fbf8ff398236031149116a7fff6f777ff95cad3df9"}, + {file = "zstandard-0.23.0-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:ab19a2d91963ed9e42b4e8d77cd847ae8381576585bad79dbd0a8837a9f6620a"}, + {file = "zstandard-0.23.0-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:59556bf80a7094d0cfb9f5e50bb2db27fefb75d5138bb16fb052b61b0e0eeeb0"}, + {file = "zstandard-0.23.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:27d3ef2252d2e62476389ca8f9b0cf2bbafb082a3b6bfe9d90cbcbb5529ecf7c"}, + {file = "zstandard-0.23.0-cp310-cp310-win32.whl", hash = "sha256:5d41d5e025f1e0bccae4928981e71b2334c60f580bdc8345f824e7c0a4c2a813"}, + {file = "zstandard-0.23.0-cp310-cp310-win_amd64.whl", hash = "sha256:519fbf169dfac1222a76ba8861ef4ac7f0530c35dd79ba5727014613f91613d4"}, + {file = "zstandard-0.23.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:34895a41273ad33347b2fc70e1bff4240556de3c46c6ea430a7ed91f9042aa4e"}, + {file = "zstandard-0.23.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:77ea385f7dd5b5676d7fd943292ffa18fbf5c72ba98f7d09fc1fb9e819b34c23"}, + {file = "zstandard-0.23.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:983b6efd649723474f29ed42e1467f90a35a74793437d0bc64a5bf482bedfa0a"}, + {file = "zstandard-0.23.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:80a539906390591dd39ebb8d773771dc4db82ace6372c4d41e2d293f8e32b8db"}, + {file = "zstandard-0.23.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:445e4cb5048b04e90ce96a79b4b63140e3f4ab5f662321975679b5f6360b90e2"}, + {file = "zstandard-0.23.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fd30d9c67d13d891f2360b2a120186729c111238ac63b43dbd37a5a40670b8ca"}, + {file = "zstandard-0.23.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d20fd853fbb5807c8e84c136c278827b6167ded66c72ec6f9a14b863d809211c"}, + {file = "zstandard-0.23.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ed1708dbf4d2e3a1c5c69110ba2b4eb6678262028afd6c6fbcc5a8dac9cda68e"}, + {file = "zstandard-0.23.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:be9b5b8659dff1f913039c2feee1aca499cfbc19e98fa12bc85e037c17ec6ca5"}, + {file = "zstandard-0.23.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:65308f4b4890aa12d9b6ad9f2844b7ee42c7f7a4fd3390425b242ffc57498f48"}, + {file = "zstandard-0.23.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:98da17ce9cbf3bfe4617e836d561e433f871129e3a7ac16d6ef4c680f13a839c"}, + {file = "zstandard-0.23.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:8ed7d27cb56b3e058d3cf684d7200703bcae623e1dcc06ed1e18ecda39fee003"}, + {file = "zstandard-0.23.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:b69bb4f51daf461b15e7b3db033160937d3ff88303a7bc808c67bbc1eaf98c78"}, + {file = "zstandard-0.23.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:034b88913ecc1b097f528e42b539453fa82c3557e414b3de9d5632c80439a473"}, + {file = "zstandard-0.23.0-cp311-cp311-win32.whl", hash = "sha256:f2d4380bf5f62daabd7b751ea2339c1a21d1c9463f1feb7fc2bdcea2c29c3160"}, + {file = "zstandard-0.23.0-cp311-cp311-win_amd64.whl", hash = "sha256:62136da96a973bd2557f06ddd4e8e807f9e13cbb0bfb9cc06cfe6d98ea90dfe0"}, + {file = "zstandard-0.23.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:b4567955a6bc1b20e9c31612e615af6b53733491aeaa19a6b3b37f3b65477094"}, + {file = "zstandard-0.23.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1e172f57cd78c20f13a3415cc8dfe24bf388614324d25539146594c16d78fcc8"}, + {file = "zstandard-0.23.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b0e166f698c5a3e914947388c162be2583e0c638a4703fc6a543e23a88dea3c1"}, + {file = "zstandard-0.23.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:12a289832e520c6bd4dcaad68e944b86da3bad0d339ef7989fb7e88f92e96072"}, + {file = "zstandard-0.23.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d50d31bfedd53a928fed6707b15a8dbeef011bb6366297cc435accc888b27c20"}, + {file = "zstandard-0.23.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:72c68dda124a1a138340fb62fa21b9bf4848437d9ca60bd35db36f2d3345f373"}, + {file = "zstandard-0.23.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:53dd9d5e3d29f95acd5de6802e909ada8d8d8cfa37a3ac64836f3bc4bc5512db"}, + {file = "zstandard-0.23.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:6a41c120c3dbc0d81a8e8adc73312d668cd34acd7725f036992b1b72d22c1772"}, + {file = "zstandard-0.23.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:40b33d93c6eddf02d2c19f5773196068d875c41ca25730e8288e9b672897c105"}, + {file = "zstandard-0.23.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:9206649ec587e6b02bd124fb7799b86cddec350f6f6c14bc82a2b70183e708ba"}, + {file = "zstandard-0.23.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:76e79bc28a65f467e0409098fa2c4376931fd3207fbeb6b956c7c476d53746dd"}, + {file = "zstandard-0.23.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:66b689c107857eceabf2cf3d3fc699c3c0fe8ccd18df2219d978c0283e4c508a"}, + {file = "zstandard-0.23.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:9c236e635582742fee16603042553d276cca506e824fa2e6489db04039521e90"}, + {file = "zstandard-0.23.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:a8fffdbd9d1408006baaf02f1068d7dd1f016c6bcb7538682622c556e7b68e35"}, + {file = "zstandard-0.23.0-cp312-cp312-win32.whl", hash = "sha256:dc1d33abb8a0d754ea4763bad944fd965d3d95b5baef6b121c0c9013eaf1907d"}, + {file = "zstandard-0.23.0-cp312-cp312-win_amd64.whl", hash = "sha256:64585e1dba664dc67c7cdabd56c1e5685233fbb1fc1966cfba2a340ec0dfff7b"}, + {file = "zstandard-0.23.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:576856e8594e6649aee06ddbfc738fec6a834f7c85bf7cadd1c53d4a58186ef9"}, + {file = "zstandard-0.23.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:38302b78a850ff82656beaddeb0bb989a0322a8bbb1bf1ab10c17506681d772a"}, + {file = "zstandard-0.23.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d2240ddc86b74966c34554c49d00eaafa8200a18d3a5b6ffbf7da63b11d74ee2"}, + {file = "zstandard-0.23.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2ef230a8fd217a2015bc91b74f6b3b7d6522ba48be29ad4ea0ca3a3775bf7dd5"}, + {file = "zstandard-0.23.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:774d45b1fac1461f48698a9d4b5fa19a69d47ece02fa469825b442263f04021f"}, + {file = "zstandard-0.23.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6f77fa49079891a4aab203d0b1744acc85577ed16d767b52fc089d83faf8d8ed"}, + {file = "zstandard-0.23.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ac184f87ff521f4840e6ea0b10c0ec90c6b1dcd0bad2f1e4a9a1b4fa177982ea"}, + {file = "zstandard-0.23.0-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:c363b53e257246a954ebc7c488304b5592b9c53fbe74d03bc1c64dda153fb847"}, + {file = "zstandard-0.23.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:e7792606d606c8df5277c32ccb58f29b9b8603bf83b48639b7aedf6df4fe8171"}, + {file = "zstandard-0.23.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a0817825b900fcd43ac5d05b8b3079937073d2b1ff9cf89427590718b70dd840"}, + {file = "zstandard-0.23.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:9da6bc32faac9a293ddfdcb9108d4b20416219461e4ec64dfea8383cac186690"}, + {file = "zstandard-0.23.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:fd7699e8fd9969f455ef2926221e0233f81a2542921471382e77a9e2f2b57f4b"}, + {file = "zstandard-0.23.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:d477ed829077cd945b01fc3115edd132c47e6540ddcd96ca169facff28173057"}, + {file = "zstandard-0.23.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:fa6ce8b52c5987b3e34d5674b0ab529a4602b632ebab0a93b07bfb4dfc8f8a33"}, + {file = "zstandard-0.23.0-cp313-cp313-win32.whl", hash = "sha256:a9b07268d0c3ca5c170a385a0ab9fb7fdd9f5fd866be004c4ea39e44edce47dd"}, + {file = "zstandard-0.23.0-cp313-cp313-win_amd64.whl", hash = "sha256:f3513916e8c645d0610815c257cbfd3242adfd5c4cfa78be514e5a3ebb42a41b"}, + {file = "zstandard-0.23.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2ef3775758346d9ac6214123887d25c7061c92afe1f2b354f9388e9e4d48acfc"}, + {file = "zstandard-0.23.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:4051e406288b8cdbb993798b9a45c59a4896b6ecee2f875424ec10276a895740"}, + {file = "zstandard-0.23.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e2d1a054f8f0a191004675755448d12be47fa9bebbcffa3cdf01db19f2d30a54"}, + {file = "zstandard-0.23.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f83fa6cae3fff8e98691248c9320356971b59678a17f20656a9e59cd32cee6d8"}, + {file = "zstandard-0.23.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:32ba3b5ccde2d581b1e6aa952c836a6291e8435d788f656fe5976445865ae045"}, + {file = "zstandard-0.23.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2f146f50723defec2975fb7e388ae3a024eb7151542d1599527ec2aa9cacb152"}, + {file = "zstandard-0.23.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1bfe8de1da6d104f15a60d4a8a768288f66aa953bbe00d027398b93fb9680b26"}, + {file = "zstandard-0.23.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:29a2bc7c1b09b0af938b7a8343174b987ae021705acabcbae560166567f5a8db"}, + {file = "zstandard-0.23.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:61f89436cbfede4bc4e91b4397eaa3e2108ebe96d05e93d6ccc95ab5714be512"}, + {file = "zstandard-0.23.0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:53ea7cdc96c6eb56e76bb06894bcfb5dfa93b7adcf59d61c6b92674e24e2dd5e"}, + {file = "zstandard-0.23.0-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:a4ae99c57668ca1e78597d8b06d5af837f377f340f4cce993b551b2d7731778d"}, + {file = "zstandard-0.23.0-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:379b378ae694ba78cef921581ebd420c938936a153ded602c4fea612b7eaa90d"}, + {file = "zstandard-0.23.0-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:50a80baba0285386f97ea36239855f6020ce452456605f262b2d33ac35c7770b"}, + {file = "zstandard-0.23.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:61062387ad820c654b6a6b5f0b94484fa19515e0c5116faf29f41a6bc91ded6e"}, + {file = "zstandard-0.23.0-cp38-cp38-win32.whl", hash = "sha256:b8c0bd73aeac689beacd4e7667d48c299f61b959475cdbb91e7d3d88d27c56b9"}, + {file = "zstandard-0.23.0-cp38-cp38-win_amd64.whl", hash = "sha256:a05e6d6218461eb1b4771d973728f0133b2a4613a6779995df557f70794fd60f"}, + {file = "zstandard-0.23.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3aa014d55c3af933c1315eb4bb06dd0459661cc0b15cd61077afa6489bec63bb"}, + {file = "zstandard-0.23.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0a7f0804bb3799414af278e9ad51be25edf67f78f916e08afdb983e74161b916"}, + {file = "zstandard-0.23.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fb2b1ecfef1e67897d336de3a0e3f52478182d6a47eda86cbd42504c5cbd009a"}, + {file = "zstandard-0.23.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:837bb6764be6919963ef41235fd56a6486b132ea64afe5fafb4cb279ac44f259"}, + {file = "zstandard-0.23.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1516c8c37d3a053b01c1c15b182f3b5f5eef19ced9b930b684a73bad121addf4"}, + {file = "zstandard-0.23.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:48ef6a43b1846f6025dde6ed9fee0c24e1149c1c25f7fb0a0585572b2f3adc58"}, + {file = "zstandard-0.23.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:11e3bf3c924853a2d5835b24f03eeba7fc9b07d8ca499e247e06ff5676461a15"}, + {file = "zstandard-0.23.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:2fb4535137de7e244c230e24f9d1ec194f61721c86ebea04e1581d9d06ea1269"}, + {file = "zstandard-0.23.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8c24f21fa2af4bb9f2c492a86fe0c34e6d2c63812a839590edaf177b7398f700"}, + {file = "zstandard-0.23.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:a8c86881813a78a6f4508ef9daf9d4995b8ac2d147dcb1a450448941398091c9"}, + {file = "zstandard-0.23.0-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:fe3b385d996ee0822fd46528d9f0443b880d4d05528fd26a9119a54ec3f91c69"}, + {file = "zstandard-0.23.0-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:82d17e94d735c99621bf8ebf9995f870a6b3e6d14543b99e201ae046dfe7de70"}, + {file = "zstandard-0.23.0-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:c7c517d74bea1a6afd39aa612fa025e6b8011982a0897768a2f7c8ab4ebb78a2"}, + {file = "zstandard-0.23.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:1fd7e0f1cfb70eb2f95a19b472ee7ad6d9a0a992ec0ae53286870c104ca939e5"}, + {file = "zstandard-0.23.0-cp39-cp39-win32.whl", hash = "sha256:43da0f0092281bf501f9c5f6f3b4c975a8a0ea82de49ba3f7100e64d422a1274"}, + {file = "zstandard-0.23.0-cp39-cp39-win_amd64.whl", hash = "sha256:f8346bfa098532bc1fb6c7ef06783e969d87a99dd1d2a5a18a892c1d7a643c58"}, + {file = "zstandard-0.23.0.tar.gz", hash = "sha256:b2d8c62d08e7255f68f7a740bae85b3c9b8e5466baa9cbf7f57f1cde0ac6bc09"}, ] [package.dependencies] @@ -2459,5 +1686,5 @@ cffi = ["cffi (>=1.11)"] [metadata] lock-version = "2.0" -python-versions = "~=3.10.0" -content-hash = "5eb6cfca92f09b1f4bba15042adc44cafa174f28d7b4520bde92f0f7235fd233" +python-versions = ">=3.11.0,<3.12.dev0" +content-hash = "147a017aa07a4772f3986629f7600b5d105c53f90589a6036d7687d8e575ffe6" diff --git a/pyproject.toml b/pyproject.toml index 2b8e3f8..c3afcb3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,31 +1,29 @@ [tool.poetry] name = "bioxelnodes" -version = "0.2.9" +version = "0.3.0" description = "" authors = ["Ma Nan "] license = "MIT" readme = "README.md" [tool.poetry.dependencies] -python = "~=3.10.0" -bpy = "~=4.0" -simpleitk = "^2.3.1" -scikit-image = "^0.24.0" -pyometiff = "^1.0.0" -mrcfile = "^1.5.1" +python = ">=3.11.0,<3.12.dev0" +simpleitk = "2.3.1" +pyometiff = "1.0.0" +mrcfile = "1.5.1" +h5py = "3.11.0" +transforms3d = "0.4.2" [tool.poetry.group.dev.dependencies] -ipykernel = "^6.25.2" -pytest = "^7.4.2" -pytest-dependency = "^0.5.1" -mkdocs = "^1.5.3" -mkdocs-material = "^9.4.6" -mkdocstrings = { extras = ["python"], version = "^0.23.0" } -mkdocs-click = "^0.8.1" -autopep8 = "^2.0.4" -pytest-cov = "^4.1.0" -mike = "^2.0.0" - +bpy = "^4.2.0" +pytest = "^8.3.2" +pytest-dependency = "^0.6.0" +pytest-cov = "^5.0.0" +mkdocs = "^1.6.0" +mkdocs-material = "^9.5.30" +autopep8 = "^2.3.1" +mike = "^2.1.2" +tomlkit = "^0.13.0" [build-system] requires = ["poetry-core"] diff --git a/bioxelnodes/requirements.txt b/requirements.txt similarity index 53% rename from bioxelnodes/requirements.txt rename to requirements.txt index d46025a..63312aa 100644 --- a/bioxelnodes/requirements.txt +++ b/requirements.txt @@ -1,3 +1,5 @@ SimpleITK==2.3.1 # Insight Segmentation and Registration Toolkit. pyometiff==1.0.0 # .ome.tiff -mrcfile==1.5.1 # .map \ No newline at end of file +mrcfile==1.5.1 # .map +h5py==3.11.0 # .h5 +transforms3d==0.4.2 # transforms \ No newline at end of file diff --git a/scipy_ndimage/linux-x64/_nd_image.cpython-311-x86_64-linux-gnu.so b/scipy_ndimage/linux-x64/_nd_image.cpython-311-x86_64-linux-gnu.so new file mode 100644 index 0000000..60edc5b Binary files /dev/null and b/scipy_ndimage/linux-x64/_nd_image.cpython-311-x86_64-linux-gnu.so differ diff --git a/scipy_ndimage/macos-arm64/_nd_image.cpython-311-darwin.so b/scipy_ndimage/macos-arm64/_nd_image.cpython-311-darwin.so new file mode 100644 index 0000000..15ffc08 Binary files /dev/null and b/scipy_ndimage/macos-arm64/_nd_image.cpython-311-darwin.so differ diff --git a/scipy_ndimage/macos-x64/_nd_image.cpython-311-darwin.so b/scipy_ndimage/macos-x64/_nd_image.cpython-311-darwin.so new file mode 100644 index 0000000..3a51057 Binary files /dev/null and b/scipy_ndimage/macos-x64/_nd_image.cpython-311-darwin.so differ diff --git a/bioxelnodes/scipy/_nd_image.cp311-win_amd64.pyd b/scipy_ndimage/windows-x64/_nd_image.cp311-win_amd64.pyd similarity index 100% rename from bioxelnodes/scipy/_nd_image.cp311-win_amd64.pyd rename to scipy_ndimage/windows-x64/_nd_image.cp311-win_amd64.pyd