psr-factory 5.0.0b21__py3-none-win_amd64.whl → 5.0.0b24__py3-none-win_amd64.whl

psr/cloud/aws.py

@@ -7,250 +7,178 @@ import boto3
 from botocore.exceptions import ClientError
 
 
-def _get_region(url):
-    """Extract the region from the S3 URL."""
-    if url:
-        parts = url.split(".")
-        return parts[0]
-    return None
-
-
-def upload_file_to_s3(
-    s3_client, bucket_name, file_path, object_name=None, extra_args=None
-):
-    """Upload a file to an S3 bucket using a provided S3 client.
-
-    :param s3_client: Initialized S3 client.
-    :param bucket_name: Name of the S3 bucket.
-    :param file_path: Path to the file to upload.
-    :param object_name: S3 object name. If not specified, file_path's basename is used.
-    :param extra_args: A dictionary of extra arguments to pass to S3's upload_file.
-    :return: True if file was uploaded, else False.
-    """
-    if object_name is None:
-        object_name = os.path.basename(file_path)
-
-    try:
-        s3_client.upload_file(file_path, bucket_name, object_name, ExtraArgs=extra_args)
-        return True
-    except ClientError as e:
-        print(f"Error uploading file: {e}")
-        return False
-
-
-def upload_case_to_s3(
-    files: List[str],
-    repository_id: str,
-    cluster_name: str,
-    checksums: Optional[Dict[str, str]] = None,
-    access: Optional[str] = None,
-    secret: Optional[str] = None,
-    session_token: Optional[str] = None,
-    bucket_name: Optional[str] = None,
-    url: Optional[str] = None,
-    zip_compress: bool = False,
-    compress_zip_name: str = None,
-):
-    """Upload files to an S3 bucket."""
-
-    region = _get_region(url)
-
-    if not region or not access or not secret or not session_token or not bucket_name:
-        raise ValueError("Unable to set up AWS connection.")
-
-    s3_client = boto3.client(
-        "s3",
-        aws_access_key_id=access,
-        aws_secret_access_key=secret,
-        aws_session_token=session_token,
-        region_name=region,
-    )
-
-    # Base metadata, common for both zip and individual files
-    base_metadata: Dict[str, str] = {
-        "upload": str(True).lower(),
-        "user-agent": "aws-fsx-lustre",
-        "file-owner": "537",
-        "file-group": "500",
-        "file-permissions": "100777",
-    }
-
-    if zip_compress and not compress_zip_name:
-        compress_zip_name = str(repository_id)
-
-    if zip_compress:
-        # Create a temporary zip file
-        with tempfile.NamedTemporaryFile(suffix=".zip", delete=False) as tmp_zip_file:
-            zip_path = tmp_zip_file.name
-            tmp_zip_file.close()  # Close the file handle so zipfile can open it
-
+class AWS:
+    def __init__(
+        self,
+        access: str,
+        secret: str,
+        session_token: str,
+        url: str,
+        bucket_name: str,
+        Logger=None,
+    ):
+        self.s3_client = boto3.client(
+            "s3",
+            aws_access_key_id=access,
+            aws_secret_access_key=secret,
+            aws_session_token=session_token,
+            region_name=AWS.get_region(url),
+        )
+        self.bucket_name = bucket_name
+        self.logger = Logger
+
+    @staticmethod
+    def get_region(url: Optional[str]) -> Optional[str]:
+        """Extract the region from the S3 URL."""
+        if url:
+            parts = url.split(".")
+            return parts[0]
+        return None
+
+    def upload_file(
+        self,
+        file_path: str,
+        object_name: Optional[str] = None,
+        extra_args: Optional[dict] = None,
+    ) -> bool:
+        """Upload a file to an S3 bucket using the AWS instance's S3 client."""
+        if object_name is None:
+            object_name = os.path.basename(file_path)
         try:
-            with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED) as zipf:
-                for file_path in files:
-                    # Add file to zip, using only the basename inside the zip
-                    zipf.write(file_path, arcname=os.path.basename(file_path))
-
-            # Construct object name for the zip file
-            object_name = f"{repository_id}/uploaded/{compress_zip_name}.zip"
-
-            # For zip files, we use the base metadata without a specific checksum
-            # (as checksums are per-file in the original design)
-            extra_args = {
-                "Metadata": base_metadata.copy()
-            }  # Use a copy to avoid modifying base_metadata
-
-            if not upload_file_to_s3(
-                s3_client, bucket_name, zip_path, object_name, extra_args=extra_args
-            ):
-                raise ValueError(
-                    f"Failed to upload zip file {zip_path} to S3 bucket {bucket_name}."
-                )
-
-        finally:
-            # Clean up the temporary zip file
-            if os.path.exists(zip_path):
-                os.unlink(zip_path)
-
-    else:
-        # Original logic: upload files individually
-        for file_path in files:
-            file_basename = os.path.basename(file_path)
-            object_name = f"{repository_id}/uploaded/{file_basename}"
-
-            current_file_metadata = base_metadata.copy()
-            if checksums:
-                current_file_metadata["checksum"] = checksums.get(file_basename, "")
-
-            extra_args = {"Metadata": current_file_metadata}
-
-            if not upload_file_to_s3(
-                s3_client, bucket_name, file_path, object_name, extra_args=extra_args
-            ):
-                raise ValueError(
-                    f"Failed to upload file {file_path} to S3 bucket {bucket_name}."
-                )
-
-    # Always upload .metadata files if the source 'files' list is provided
-    if files:
-        # Assuming all files in the 'files' list share the same parent directory,
-        # which is the case data directory.
-        data_directory = os.path.dirname(files[0])
-        metadata_dir_local_path = os.path.join(data_directory, ".metadata")
-
-        if os.path.isdir(metadata_dir_local_path):
-            # Iterate through the original list of files to find corresponding metadata files
-            for original_file_path in files:
-                original_file_basename = os.path.basename(original_file_path)
-                local_metadata_file_path = os.path.join(
-                    metadata_dir_local_path, original_file_basename
-                )
-
-                if os.path.isfile(local_metadata_file_path):
-                    # S3 object name for the metadata file (e.g., repository_id/.metadata/original_file_basename)
-                    s3_metadata_object_name = (
-                        f"{repository_id}/.metadata/{original_file_basename}"
+            self.s3_client.upload_file(
+                file_path, self.bucket_name, object_name, ExtraArgs=extra_args
+            )
+            return True
+        except ClientError as e:
+            self.logger.error(f"Error uploading file: {e}")
+            return False
+
+    def upload_case(
+        self,
+        files: List[str],
+        repository_id: str,
+        cluster_name: str,
+        checksums: Optional[Dict[str, str]] = None,
+        zip_compress: bool = False,
+        compress_zip_name: str = None,
+    ):
+        """Upload files to an S3 bucket."""
+        base_metadata: Dict[str, str] = {
+            "upload": str(True).lower(),
+            "user-agent": "aws-fsx-lustre",
+            "file-owner": "537",
+            "file-group": "500",
+            "file-permissions": "100777",
+        }
+
+        if zip_compress and not compress_zip_name:
+            compress_zip_name = str(repository_id)
+
+        if zip_compress:
+            # Create a temporary zip file
+            with tempfile.NamedTemporaryFile(
+                suffix=".zip", delete=False
+            ) as tmp_zip_file:
+                zip_path = tmp_zip_file.name
+                tmp_zip_file.close()  # Close the file handle so zipfile can open it
+
+            try:
+                with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED) as zipf:
+                    for file_path in files:
+                        zipf.write(file_path, arcname=os.path.basename(file_path))
+
+                object_name = f"{repository_id}/uploaded/{compress_zip_name}.zip"
+                extra_args = {"Metadata": base_metadata.copy()}
+
+                if not self.upload_file(zip_path, object_name, extra_args=extra_args):
+                    raise ValueError(
+                        f"Failed to upload zip file {zip_path} to S3 bucket {self.bucket_name}."
+                    )
+            finally:
+                if os.path.exists(zip_path):
+                    os.unlink(zip_path)
+        else:
+            for file_path in files:
+                file_basename = os.path.basename(file_path)
+                object_name = f"{repository_id}/uploaded/{file_basename}"
+
+                current_file_metadata = base_metadata.copy()
+                if checksums:
+                    current_file_metadata["checksum"] = checksums.get(file_basename, "")
+
+                extra_args = {"Metadata": current_file_metadata}
+
+                if not self.upload_file(file_path, object_name, extra_args=extra_args):
+                    raise ValueError(
+                        f"Failed to upload file {file_path} to S3 bucket {self.bucket_name}."
                     )
-                    extra_args = {"Metadata": base_metadata.copy()}
-                    if not upload_file_to_s3(
-                        s3_client,
-                        bucket_name,
-                        local_metadata_file_path,
-                        s3_metadata_object_name,
-                        extra_args=extra_args,
-                    ):
-                        raise ValueError(
-                            f"Failed to upload metadata file {local_metadata_file_path} to S3 bucket {bucket_name}."
-                        )
-
-
-def _download_s3_object(
-    s3_client, bucket_name: str, s3_object_key: str, local_file_path: str
-) -> bool:
-    """
-    Downloads a single object from S3 to a local file path.
-
-    :param s3_client: Initialized S3 client.
-    :param bucket_name: Name of the S3 bucket.
-    :param s3_object_key: The key of the object in S3.
-    :param local_file_path: The local path where the file should be saved.
-    :return: True if download was successful, False otherwise.
-    """
-
-    try:
-        s3_client.download_file(bucket_name, s3_object_key, local_file_path)
-        return True
-    except ClientError as e:
-        print(f"ERROR: Failed to download {s3_object_key} from S3: {e}")
-        return False
-
-
-def download_case_from_s3(
-    repository_id: str,
-    cluster_name: str,  # Kept for consistency with caller, though not used directly in S3 ops
-    access: str,
-    secret: str,
-    session_token: str,
-    bucket_name: str,
-    url: str,  # S3 endpoint URL, used by _get_region
-    output_path: str,
-    file_list: List[str],
-) -> List[str]:
-    """
-    Downloads files from an S3 bucket for a given case repository.
-
-    It iterates through the provided `file_list`, downloads each specified file
-    from the S3 path `{repository_id}/{file_in_list}`, preserving its relative path
-    under `output_path`. It then checks if each downloaded file is gzipped,
-    decompresses it if necessary, and returns a list of basenames of the
-    final downloaded (and potentially decompressed) files.
-
-    :param repository_id: The ID of the repository in S3.
-    :param cluster_name: Name of the cluster (for context, not used in S3 calls).
-    :param access: AWS access key ID.
-    :param secret: AWS secret access key.
-    :param session_token: AWS session token.
-    :param bucket_name: Name of the S3 bucket.
-    :param url: S3 service URL (used to determine region via _get_region).
-    :param output_path: Local directory where files will be downloaded.
-    :param file_list: A list of file names (basenames) to be downloaded.
-    :return: A list of basenames of the downloaded (and decompressed) files.
-    :raises ValueError: If S3 connection parameters are missing or filter is invalid.
-    :raises RuntimeError: If S3 operations fail.
-    """
-    region = _get_region(url)
-    if not all([region, access, secret, session_token, bucket_name]):
-        # TODO: Replace print with proper logging
-        print(
-            "ERROR: Missing S3 connection parameters (region, access, secret, token, or bucket name)."
-        )
-        raise ValueError("Missing S3 connection parameters.")
-
-    s3_client = boto3.client(
-        "s3",
-        aws_access_key_id=access,
-        aws_secret_access_key=secret,
-        aws_session_token=session_token,
-        region_name=region,
-    )
-
-    downloaded_files: List[str] = []
 
-    try:
-        for file_name in file_list:
-            # Construct the full S3 object key
-            s3_object_key = f"{repository_id}/{file_name}"
+        # Always upload .metadata files if the source 'files' list is provided
+        if files:
+            data_directory = os.path.dirname(files[0])
+            metadata_dir_local_path = os.path.join(data_directory, ".metadata")
 
-            local_file_path = os.path.join(output_path, file_name)
-            if _download_s3_object(
-                s3_client, bucket_name, s3_object_key, local_file_path
-            ):
-                downloaded_files.append(os.path.basename(local_file_path))
+            if os.path.isdir(metadata_dir_local_path):
+                for original_file_path in files:
+                    original_file_basename = os.path.basename(original_file_path)
+                    local_metadata_file_path = os.path.join(
+                        metadata_dir_local_path, original_file_basename
+                    )
 
-    except ClientError as e:
-        print(f"ERROR: S3 ClientError during download: {e}")
-        raise RuntimeError(f"Failed to download files from S3: {e}")
-    except Exception as e:
-        print(f"ERROR: An unexpected error occurred during download: {e}")
-        raise RuntimeError(f"An unexpected error occurred during S3 download: {e}")
+                    if os.path.isfile(local_metadata_file_path):
+                        s3_metadata_object_name = (
+                            f"{repository_id}/.metadata/{original_file_basename}"
+                        )
+                        extra_args = {"Metadata": base_metadata.copy()}
+                        if not self.upload_file(
+                            local_metadata_file_path,
+                            s3_metadata_object_name,
+                            extra_args=extra_args,
+                        ):
+                            raise ValueError(
+                                f"Failed to upload metadata file {local_metadata_file_path} to S3 bucket {self.bucket_name}."
+                            )
+
+    def download_file(self, s3_object_key: str, local_file_path: str) -> bool:
+        """Downloads a single object from S3 to a local file path."""
+        try:
+            self.s3_client.download_file(
+                self.bucket_name, s3_object_key, local_file_path
+            )
+            return True
+        except ClientError as e:
+            self.logger.error(f"ERROR: Failed to download {s3_object_key} from S3: {e}")
+            return False
+
+    def download_case(
+        self,
+        repository_id: str,
+        cluster_name: str,
+        output_path: str,
+        file_list: List[str],
+    ) -> List[str]:
+        """
+        Downloads files from an S3 bucket for a given case repository.
+        """
+        downloaded_files: List[str] = []
 
-    return downloaded_files
+        try:
+            for file_name in file_list:
+                s3_object_key = f"{repository_id}/{file_name}"
+                local_file_path = os.path.join(output_path, file_name)
+                if self.logger:
+                    self.logger.info(
+                        f"Downloading {s3_object_key} to {local_file_path}"
+                    )
+                if self.download_file(s3_object_key, local_file_path):
+                    downloaded_files.append(os.path.basename(local_file_path))
+        except ClientError as e:
+            self.logger.error(f"ERROR: S3 ClientError during download: {e}")
+            raise RuntimeError(f"Failed to download files from S3: {e}")
+        except Exception as e:
+            self.logger.error(
+                f"ERROR: An unexpected error occurred during download: {e}"
+            )
+            raise RuntimeError(f"An unexpected error occurred during S3 download: {e}")
+
+        return downloaded_files

psr/cloud/cloud.py

@@ -23,7 +23,7 @@ import pefile
 import zeep
 from filelock import FileLock
 
-from .aws import download_case_from_s3, upload_case_to_s3
+from .aws import AWS
 from .data import Case, CloudError, CloudInputError
 from .desktop import import_case
 from .log import enable_log_timestamp, get_logger
@@ -647,7 +647,8 @@ class Client:
         xml_content = create_case_xml(parameters)
 
         if dry_run:
-            return xml_content
+            self._logger.info(f"Dry run:\n{xml_content}")
+            return 0
 
         if self._python_client:
             case_id = self._execute_case(parameters)
@@ -758,6 +759,21 @@ class Client:
         files: Optional[List[str]] = None,
         extensions: Optional[List[str]] = None,
     ) -> None:
+        case = self.get_case(case_id)
+        output_path = _handle_relative_path(output_path)
+        parameters = {
+            "urlServico": self.cluster["url"],
+            "usuario": self.username,
+            "senha": self.__password,
+            "idioma": "3",
+            "_cluster": self.cluster["name"],
+            "modelo": case.program,
+            "comando": "download",
+            "diretorioDestino": output_path,
+            "repositorioId": str(case_id),
+        }
+
+        # Handling download filter
         filter = ""
 
         if not extensions and not files:
@@ -767,33 +783,31 @@ class Client:
 
         if extensions:
             Client._validate_extensions(extensions)
-            filter_elements.extend([f"*.{ext}" for ext in extensions])
+            filter_elements.extend([f".*.{ext}" for ext in extensions])
 
         if files:
             filter_elements.extend(files)
 
-        filter += "|".join(filter_elements)
+        if self._python_client:
+            # Convert mask to regex for python_client
+            # regex_parts = []
+            # for part in filter_elements:
+            #     regex_parts.append(r".*" + re.escape(part[1:]) + r"$" if part.startswith("*") else r"^" + re.escape(part) + r"$")
+            filter = "|".join(filter_elements)
+            parameters["filtroDownload"] = filter
+        else:
+            filter = "|".join(filter_elements)
+            parameters["filtroDownloadPorMascara"] = filter
 
         self._logger.info("Download filter: " + filter)
-        case = self.get_case(case_id)
-        output_path = _handle_relative_path(output_path)
-        parameters = {
-            "urlServico": self.cluster["url"],
-            "usuario": self.username,
-            "senha": self.__password,
-            "idioma": "3",
-            "_cluster": self.cluster["name"],
-            "modelo": case.program,
-            "comando": "download",
-            "diretorioDestino": output_path,
-            "repositorioId": str(case_id),
-            "filtroDownloadPorMascara": filter,
-        }
 
         os.makedirs(output_path, exist_ok=True)
 
         if self._python_client:
-            self._download_results_python(parameters)  ## Not implemented yet
+            self._download_results_python(parameters)
+            self._logger.debug("Creating download.ok file")
+            with open(os.path.join(output_path, "download.ok"), "w") as f:
+                f.write("")
         else:
             # Download results using Console
             xml_content = create_case_xml(parameters)
@@ -969,7 +983,6 @@ class Client:
             parameters.update(additional_arguments)
 
         xml_input = create_case_xml(parameters)
-
         try:
             xml_output_str = portal_ws.service.despacharServico(
                 service, self.username, password_md5, xml_input
@@ -1098,19 +1111,23 @@ class Client:
             f"Uploading list of files to remote repository {repository_id.text}"
         )
 
-        # Uploading files to S3
-        upload_case_to_s3(
-            files=file_list,
-            repository_id=repository_id.text,
-            cluster_name=self.cluster["name"],
-            checksums=checksum_dictionary,
+        awsS3 = AWS(
             access=cloud_access.text if cloud_access is not None else None,
             secret=cloud_secret.text if cloud_secret is not None else None,
+            bucket_name=bucket_name.text if bucket_name is not None else None,
+            url=cloud_aws_url.text if cloud_aws_url is not None else None,
             session_token=cloud_session_token.text
             if cloud_session_token is not None
             else None,
-            bucket_name=bucket_name.text if bucket_name is not None else None,
-            url=cloud_aws_url.text if cloud_aws_url is not None else None,
+            Logger=self._logger,
+        )
+
+        # TODO validate when no file has been sent at all
+        awsS3.upload_case(
+            files=file_list,
+            repository_id=repository_id.text,
+            cluster_name=self.cluster["name"],
+            checksums=checksum_dictionary,
             zip_compress=True,
         )
 
@@ -1168,7 +1185,7 @@ class Client:
         """
 
         repository_id = parameters.get("repositorioId")
-        download_filter = parameters.get("filtroDownloadPorMascara")
+        download_filter = parameters.get("filtroDownload")
         output_path = parameters.get("diretorioDestino")
 
         download_filter = (
@@ -1179,37 +1196,48 @@ class Client:
             "buscaCredenciasDownload", additional_arguments=parameters
         )
 
-        access = credentials.find("./Parametro[@nome='cloudAccess']").text
-        secret = credentials.find("./Parametro[@nome='cloudSecret']").text
-        session_token = credentials.find("./Parametro[@nome='cloudSessionToken']").text
-        url = credentials.find("./Parametro[@nome='cloudUrl']").text
+        cloud_access = credentials.find("./Parametro[@nome='cloudAccess']").text
+        cloud_secret = credentials.find("./Parametro[@nome='cloudSecret']").text
+        cloud_session_token = credentials.find(
+            "./Parametro[@nome='cloudSessionToken']"
+        ).text
+        cloud_url = credentials.find("./Parametro[@nome='cloudUrl']").text
         bucket_name = credentials.find("./Parametro[@nome='diretorioBase']").text
         bucket_name = bucket_name.replace("repository", "repository-download")
 
-        if access is None or secret is None or session_token is None or url is None:
+        if (
+            cloud_access is None
+            or cloud_secret is None
+            or cloud_session_token is None
+            or cloud_url is None
+        ):
             raise CloudError("Failed to retrieve credentials for downloading results.")
 
         file_list = self.list_download_files(repository_id)
-
         # filtering files to download
         if download_filter:
-            filtered_file_list = [
-                file["name"]
-                for file in file_list
-                if re.match(download_filter, file["name"])
-            ]
+            filtered_file_list = []
+            for file in file_list:
+                if re.match(download_filter, file["name"]):
+                    filtered_file_list.append(file["name"])
         else:
             filtered_file_list = [file["name"] for file in file_list]
 
         self._logger.info("Downloading results")
-        downloaded_list = download_case_from_s3(
+        awsS3 = AWS(
+            access=cloud_access if cloud_access is not None else None,
+            secret=cloud_secret if cloud_secret is not None else None,
+            bucket_name=bucket_name if bucket_name is not None else None,
+            session_token=cloud_session_token
+            if cloud_session_token is not None
+            else None,
+            url=cloud_url if cloud_url is not None else None,
+            Logger=self._logger,
+        )
+
+        downloaded_list = awsS3.download_case(
             repository_id=parameters["repositorioId"],
             cluster_name=self.cluster["name"],
-            access=access,
-            secret=secret,
-            session_token=session_token,
-            bucket_name=bucket_name,
-            url=url,
             output_path=output_path,
             file_list=filtered_file_list,
         )

psr/factory/__init__.py

@@ -2,6 +2,6 @@
 # Unauthorized copying of this file, via any medium is strictly prohibited
 # Proprietary and confidential
 
-__version__ = "5.0.0b21"
+__version__ = "5.0.0b24"
 
 from .api import *

psr/factory/factory.pmd

@@ -5925,6 +5925,14 @@ DEFINE_MODEL MODL:SDDP_Transformer
 	VECTOR DATE DateCostToFrom @addyear_chronological
 	VECTOR REAL	CostToFrom DIM(block) INDEX DateCostToFrom
 
+	PARM INTEGER	MaxSecondaryReserveUnit
+	PARM INTEGER  HasMaxSecondaryReserve
+	VETOR DATE	DataMaxSecondaryReserve @chronological @addyear_chronological
+	VETOR REAL	MaxSecondaryReserve DIM(block) INDEX DataMaxSecondaryReserve
+	PARM INTEGER  HasPriceSecondaryReserve
+	VETOR DATE	DataPriceSecondaryReserve @chronological @addyear_chronological
+	VETOR REAL	PriceSecondaryReserve DIM(block) INDEX DataPriceSecondaryReserve
+
 	MERGE_MODEL MODL:SDDP_Asset
 END_MODEL
 //-----------------------------------------------

{psr_factory-5.0.0b21.dist-info → psr_factory-5.0.0b24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psr-factory
-Version: 5.0.0b21
+Version: 5.0.0b24
 Summary: PSR database management module.
 Author-email: "PSR Inc." <psrfactory@psr-inc.com>
 License-Expression: MIT

{psr_factory-5.0.0b21.dist-info → psr_factory-5.0.0b24.dist-info}/RECORD

@@ -2,8 +2,8 @@ psr/apps/__init__.py,sha256=frSq1WIy5vIdU21xJIGX7U3XoAZRj0pcQmFb-R00b7I,228
 psr/apps/apps.py,sha256=V8Ewht7P1I-3sSkV3dnbxbLjF2slxPjcmtzmVaLjiNY,6746
 psr/apps/version.py,sha256=vs459L6JsatAkUxna7BNG-vMCaXpO1Ye8c1bmkEx4U4,194
 psr/cloud/__init__.py,sha256=inZMwG7O9Fca9hg1BhqYObOYtTTJOkpuTIuXnkHJZkI,246
-psr/cloud/aws.py,sha256=ro8kBNVxpGDXgZ5haceqX-MAD-0F5KFDJJ4M6rRvwS8,9915
-psr/cloud/cloud.py,sha256=gLwVL4aJITo75F4x2k53TJx0-giBLF614p3t3NdfD9o,59206
+psr/cloud/aws.py,sha256=aq3yqDC_D1tplPICqa39pmMbyp_liRQ8B_Ubbl7q2Dw,7048
+psr/cloud/cloud.py,sha256=XnTYk5t27iTbbkfyQtD9gjIDUM2aNEly0-AHhaOpktw,60368
 psr/cloud/data.py,sha256=oDJyzcNsA7aAYi_qJKCUjCeGZvN-25E8KjZ-5RamNLE,4160
 psr/cloud/desktop.py,sha256=JFroCMEFV1Nz3has74n7OVrGCg2lS7Ev5bcjdw2hRxY,2980
 psr/cloud/log.py,sha256=Dvhz1enIWlFWeaRK7JAAuZVPfODgoEIRNcHEmbEliyQ,1366
@@ -16,10 +16,10 @@ psr/execqueue/config.py,sha256=3KVwASOgRlymOSPeabotgBdLVB5sPKnPQ9og2q3LQfw,1418
 psr/execqueue/db.py,sha256=sNr_StNEgZZQCKcyCWiB1WrQJIhE9UvLUxPA2tWiXGs,8498
 psr/execqueue/server.py,sha256=nW-Hi5zWHgPeLicASKJND7u6rz6eqwC16k91tUUQPxk,15741
 psr/execqueue/watcher.py,sha256=7dZZm9TiYVF7SdU0c_6Vq2_SZRobxgcspfBMzKFSsjQ,5637
-psr/factory/__init__.py,sha256=8piBlYuDWX7cfD4Smn_7jzq2sysPynLfDhgEaRhc_3A,219
+psr/factory/__init__.py,sha256=kY3IBNXaeyQ9JHV8eHprnFlcl0-RbJnoV3IwQyMMqy4,219
 psr/factory/api.py,sha256=a4zqV4LXjK3psylmRKmMd5Ke0Y7tmAG22BgR3xBfcSs,104265
-psr/factory/factory.dll,sha256=4U1WUtVdlmHEa5JzE6_xFfBVc9eCMSBy3yBTUZL6o0c,18301440
-psr/factory/factory.pmd,sha256=HryDY8T6vAV5r0W4ytKNPiIYcdn4LexrsVZ5qFYBZ-g,250535
+psr/factory/factory.dll,sha256=rDAsaX20jxOUhrKaWs9OORH1GnNRTXKsDlCDDpg2pzQ,18306560
+psr/factory/factory.pmd,sha256=ncDpoE2AnsygsIgjH0cCj9KetTPSTLvITpBogiTFX4o,250960
 psr/factory/factory.pmk,sha256=THhHxBKTBchru3fxTCos-pBAPJJnuug8T2dw0xniDfQ,580185
 psr/factory/factorylib.py,sha256=o5Irbw6k-yIOJVUtDu2YYqw2x16P2LmCdouImwSssdw,28290
 psr/factory/libcurl-x64.dll,sha256=6WGBmqX4q_eD8Vc0E2VpCvVrFV3W7TQoaKqSdbhXBu0,5313096
@@ -33,8 +33,8 @@ psr/psrfcommon/tempfile.py,sha256=5S13wa2DCLYTUdwbLm_KMBRnDRJ0WDlu8GO2BmZoNdg,39
 psr/runner/__init__.py,sha256=kI9HDX-B_LMQJUHHylFHas2rNpWfNNa0pZXoIvX_Alw,230
 psr/runner/runner.py,sha256=hCVH62HAZK_M9YUiHQgqCkMevN17utegjfRIw49MdvM,27542
 psr/runner/version.py,sha256=mch2Y8anSXGMn9w72Z78PhSRhOyn55EwaoLAYhY4McE,194
-psr_factory-5.0.0b21.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
-psr_factory-5.0.0b21.dist-info/METADATA,sha256=728tb5owfD70z5HJ5CFCj5f3mHWVZLjtjJnw1USMbEQ,2333
-psr_factory-5.0.0b21.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
-psr_factory-5.0.0b21.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
-psr_factory-5.0.0b21.dist-info/RECORD,,
+psr_factory-5.0.0b24.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
+psr_factory-5.0.0b24.dist-info/METADATA,sha256=qzWqwL7Qi-eDFqWplElyX_yOLKWeUMiR97xSu6UFfX0,2333
+psr_factory-5.0.0b24.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
+psr_factory-5.0.0b24.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
+psr_factory-5.0.0b24.dist-info/RECORD,,