psr-factory 5.0.0b32__py3-none-win_amd64.whl → 5.0.0b36__py3-none-win_amd64.whl

psr/cloud/aws.py

@@ -5,6 +5,7 @@ from typing import Dict, List, Optional
 
 import boto3
 from botocore.exceptions import ClientError
+from tqdm import tqdm
 
 
 class AWS:
@@ -14,7 +15,6 @@ class AWS:
         secret: str,
         session_token: str,
         url: str,
-        bucket_name: str,
         Logger=None,
     ):
         self.s3_client = boto3.client(
@@ -24,7 +24,6 @@ class AWS:
             aws_session_token=session_token,
             region_name=AWS.get_region(url),
         )
-        self.bucket_name = bucket_name
         self.logger = Logger
 
     @staticmethod
@@ -38,15 +37,21 @@ class AWS:
     def upload_file(
         self,
         file_path: str,
+        bucket_name: str,
         object_name: Optional[str] = None,
         extra_args: Optional[dict] = None,
+        Callback=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:
             self.s3_client.upload_file(
-                file_path, self.bucket_name, object_name, ExtraArgs=extra_args
+                file_path,
+                bucket_name,
+                object_name,
+                ExtraArgs=extra_args,
+                Callback=Callback,
             )
             return True
         except ClientError as e:
@@ -57,7 +62,7 @@ class AWS:
         self,
         files: List[str],
         repository_id: str,
-        cluster_name: str,
+        bucket_name: str,
         checksums: Optional[Dict[str, str]] = None,
         zip_compress: bool = False,
         compress_zip_name: str = None,
@@ -80,7 +85,7 @@ class AWS:
                 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
+                tmp_zip_file.close()
 
             try:
                 with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED) as zipf:
@@ -90,9 +95,11 @@ class AWS:
                 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):
+                if not self.upload_file(
+                    zip_path, bucket_name, object_name, extra_args=extra_args
+                ):
                     raise ValueError(
-                        f"Failed to upload zip file {zip_path} to S3 bucket {self.bucket_name}."
+                        f"Failed to upload zip file {zip_path} to S3 bucket {bucket_name}."
                     )
             finally:
                 if os.path.exists(zip_path):
@@ -110,7 +117,7 @@ class AWS:
 
                 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}."
+                        f"Failed to upload file {file_path} to S3 bucket {bucket_name}."
                     )
 
         # Always upload .metadata files if the source 'files' list is provided
@@ -136,15 +143,74 @@ class AWS:
                             extra_args=extra_args,
                         ):
                             raise ValueError(
-                                f"Failed to upload metadata file {local_metadata_file_path} to S3 bucket {self.bucket_name}."
+                                f"Failed to upload metadata file {local_metadata_file_path} to S3 bucket {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."""
+    def upload_version(
+        self,
+        model_name: str,
+        version_name: str,
+        bucket_name: str,
+        file_path: str,
+    ):
+        """
+        Uploads a new version of the model to S3.
+        """
+        build = os.path.basename(file_path)
+        object_name = f"{model_name}/{version_name}/linux/{build}"
+        file_size = os.path.getsize(file_path)
+        custom_format = (
+            "{desc} [{percentage:3.0f}%] |{bar}| {n_fmt}/{total_fmt} @ {rate_fmt}"
+        )
+        with tqdm(
+            bar_format=custom_format,
+            total=file_size,
+            unit="B",
+            unit_scale=True,
+            desc=f"Uploading {build}...",
+        ) as pbar:
+            if not self.upload_file(
+                file_path,
+                bucket_name,
+                object_name,
+                Callback=lambda bytes_transferred: pbar.update(bytes_transferred),
+            ):
+                raise ValueError(
+                    f"Failed to upload file {file_path} to S3 bucket {bucket_name}."
+                )
+
+        # Delete all objects in the "latest" folder
+        latest_prefix = f"{model_name}/{version_name}/linux/latest/"
+        try:
+            response = self.s3_client.list_objects_v2(
+                Bucket=bucket_name, Prefix=latest_prefix
+            )
+            if "Contents" in response:
+                for obj in response["Contents"]:
+                    self.s3_client.delete_object(Bucket=bucket_name, Key=obj["Key"])
+        except ClientError as e:
+            self.logger.error(f"Error deleting objects in 'latest' folder: {e}")
+            raise RuntimeError(f"Failed to clean 'latest' folder in S3: {e}")
+
+        # Copy the uploaded version file to the "latest" folder
+        latest_object_name = f"{model_name}/{version_name}/linux/latest/{build}"
+        copy_source = {"Bucket": bucket_name, "Key": object_name}
         try:
-            self.s3_client.download_file(
-                self.bucket_name, s3_object_key, local_file_path
+            self.s3_client.copy_object(
+                Bucket=bucket_name, CopySource=copy_source, Key=latest_object_name
             )
+        except ClientError as e:
+            self.logger.error(f"Error copying version file to 'latest' folder: {e}")
+            raise RuntimeError(
+                f"Failed to copy version file to 'latest' folder in S3: {e}"
+            )
+
+    def download_file(
+        self, bucket_name: str, 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(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}")
@@ -154,6 +220,7 @@ class AWS:
         self,
         repository_id: str,
         cluster_name: str,
+        bucket_name: str,
         output_path: str,
         file_list: List[str],
     ) -> List[str]:
@@ -170,7 +237,7 @@ class AWS:
                     self.logger.info(
                         f"Downloading {s3_object_key} to {local_file_path}"
                     )
-                if self.download_file(s3_object_key, local_file_path):
+                if self.download_file(bucket_name, 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}")
@@ -182,3 +249,23 @@ class AWS:
             raise RuntimeError(f"An unexpected error occurred during S3 download: {e}")
 
         return downloaded_files
+
+    def check_version_build_exists(
+        self,
+        bucket_name: str,
+        model_name: str,
+        version_name: str,
+        build_id: str,
+    ) -> bool:
+        """
+        Checks if a specific version build exists in the S3 bucket.
+        """
+        object_key = f"{model_name}/{version_name}/linux/{build_id}.zip"
+        try:
+            self.s3_client.head_object(Bucket=bucket_name, Key=object_key)
+            return True
+        except ClientError as e:
+            if e.response["Error"]["Code"] == "404":
+                return False
+            self.logger.error(f"Error checking version build existence: {e}")
+            raise RuntimeError(f"Failed to check version build existence in S3: {e}")

psr/cloud/cloud.py

@@ -618,7 +618,6 @@ class Client:
             "nproc": case.number_of_processes,
             "repositorioId": "0",
             "instanciaTipo": instance_type_id,
-            "validacaoModelo": "True",
             "validacaoUsuario": "False",
             "idVersao": case.program_version,
             "modeloVersao": case.program_version_name,
@@ -810,9 +809,12 @@ class Client:
                 f.write("")
         else:
             # Download results using Console
-            xml_content = create_case_xml(parameters)
-            self._run_console(xml_content)
-            self._logger.info(f"Results downloaded to {output_path}")
+            try:
+                xml_content = create_case_xml(parameters)
+                self._run_console(xml_content)
+                self._logger.info(f"Results downloaded to {output_path}")
+            except Exception as e:
+                self._logger.error(f"Error downloading results: {e}")
 
     def cancel_case(self, case_id: int, wait: bool = False) -> bool:
         parameters = {
@@ -848,42 +850,59 @@ class Client:
             return True
 
     def _cases_from_xml(self, xml: ET.Element) -> List["Case"]:
+        def get_attribute(fila, key, type_func, default=None, format_str=None):
+            value = fila.attrib.get(key)
+            try:
+                if value is None:
+                    return default
+                if format_str and type_func == datetime.strptime:
+                    return datetime.strptime(value, format_str)
+                return type_func(value)
+            except Exception as e:
+                if default is None:
+                    case_id = fila.attrib.get("repositorioId")
+                    self._logger.error(
+                        f"Error parsing field '{key}' with value '{value}' for case ID {case_id}: {e}"
+                    )
+                return default
+
         instance_type_map = self._get_instance_type_map()
         cases = []
         for fila in xml.findall("Fila"):
             try:
                 case = Case(
-                    name=fila.attrib.get("nomeCaso"),
+                    name=get_attribute(fila, "nomeCaso", str),
                     data_path=None,
-                    program=fila.attrib.get("programa"),
-                    program_version=int(fila.attrib.get("idVersao")),
-                    execution_type=int(fila.attrib.get("idTipoExecucao")),
-                    price_optimized=bool(fila.attrib.get("flagSpot")),
-                    number_of_processes=int(fila.attrib.get("numeroProcesso")),
-                    id=int(fila.attrib.get("repositorioId")),
-                    user=fila.attrib.get("usuario"),
-                    execution_date=datetime.strptime(
-                        fila.attrib.get("dataInicio"), "%d/%m/%Y %H:%M"
+                    program=get_attribute(fila, "programa", str),
+                    program_version=get_attribute(fila, "idVersao", int),
+                    execution_type=get_attribute(fila, "idTipoExecucao", int),
+                    price_optimized=get_attribute(fila, "flagSpot", bool),
+                    number_of_processes=get_attribute(fila, "numeroProcesso", int),
+                    id=get_attribute(fila, "repositorioId", int),
+                    user=get_attribute(fila, "usuario", str),
+                    execution_date=get_attribute(
+                        fila,
+                        "dataInicio",
+                        datetime.strptime,
+                        format_str="%d/%m/%Y %H:%M",
+                    ),
+                    parent_case_id=get_attribute(
+                        fila, "repositorioPai", int, default=0
                     ),
-                    parent_case_id=int(fila.attrib.get("repositorioPai"))
-                    if fila.attrib.get("repositorioPai")
-                    else 0,
                     memory_per_process_ratio=(
-                        instance_type_map[int(fila.attrib.get("instanciaTipo"))][0]
-                        if fila.attrib.get("instanciaTipo") in instance_type_map
+                        instance_type_map[get_attribute(fila, "instanciaTipo", int)][0]
+                        if get_attribute(fila, "instanciaTipo", int)
+                        in instance_type_map
                         else min([value[0] for value in instance_type_map.values()])
                     ),
-                    repository_duration=int(fila.attrib.get("duracaoRepositorio")),
-                    budget=fila.attrib.get("budget"),
+                    repository_duration=get_attribute(fila, "duracaoRepositorio", int),
+                    budget=get_attribute(fila, "budget", str),
                 )
                 cases.append(case)
-            except (TypeError, ValueError):
-                pass
-                # case_id = fila.attrib.get("repositorioId")
-                # Optionally, log the error or handle it as needed
-                # self._logger.error(f"Error processing case with ID {case_id}: {e}")
+            except Exception as e:
+                case_id = fila.attrib.get("repositorioId")
+                self._logger.error(f"Error processing case with ID {case_id}: {e}")
 
-        # sort cases by execution date desc
         cases.sort(key=lambda x: x.execution_date, reverse=True)
         return cases
 
@@ -979,6 +998,9 @@ class Client:
             if not self._python_client
             else "5.4.0",
         }
+        if service != "listarFila":
+            parameters["cluster"] = self.cluster["name"]
+
         if additional_arguments:
             parameters.update(additional_arguments)
 
@@ -1023,6 +1045,16 @@ class Client:
         )
         return self._cloud_clusters_xml_cache
 
+    def _get_upload_filter(self, parameters, category: str) -> str:
+        filter_request_result = self._make_soap_request(
+            "obterFiltros", additional_arguments=parameters
+        )
+        upload_filter = filter_request_result.find(
+            f"./Parametro[@nome='{category}']"
+        ).text
+        upload_filter = "^[a-zA-Z0-9./_]*(" + upload_filter + ")$"
+        return upload_filter
+
     def _execute_case(self, case_dict) -> int:
         """
         Execute a case on the PSR Cloud.
@@ -1032,13 +1064,8 @@ class Client:
         case_dict["programa"] = case_dict["modelo"]
         case_dict["numeroProcessos"] = case_dict["nproc"]
         case_dict["versao_cliente"] = "5.4.0"
-        filter_request_result = self._make_soap_request(
-            "obterFiltros", additional_arguments=case_dict
-        )
-        upload_filter = filter_request_result.find(
-            "./Parametro[@nome='filtroUpload']"
-        ).text
-        upload_filter = "^[a-zA-Z0-9./_]*(" + upload_filter + ")$"
+
+        upload_filter = self._get_upload_filter(case_dict, category="filtroUpload")
 
         # Create Repository
         self._logger.info("Creating remote repository")
@@ -1081,7 +1108,9 @@ class Client:
         # Filtering files to upload
         self._logger.info("Checking list of files to send")
 
-        file_list = _filter_upload_files(case_dict["diretorioDados"], upload_filter)
+        file_list = self._filter_upload_files(
+            case_dict["diretorioDados"], upload_filter
+        )
 
         if not file_list:
             self._logger.warning(
@@ -1265,12 +1294,28 @@ class Client:
             with open(file_path, "rb") as f_check:
                 return f_check.read(2) == b"\x1f\x8b"
         except IOError:
-            # TODO: Replace print with proper logging
-            print(
+            self._logger.warning(
                 f"WARNING: Could not read {file_path} to check for gzip magic number."
             )
             return False
 
+    def _filter_upload_files(self, directory: str, upload_filter: str) -> List[str]:
+        """
+        Filter files in a directory based on the upload filter.
+        :param directory: Directory to filter files from.
+        :param upload_filter: Regular expression filter for file names.
+        :return: List of filtered file paths.
+        """
+        if not os.path.exists(directory):
+            raise CloudInputError(f"Directory {directory} does not exist")
+
+        regex = re.compile(upload_filter)
+        filtered_files = []
+        for file in os.listdir(directory):
+            if regex.match(file):
+                filtered_files.append(os.path.join(directory, file))
+        return filtered_files
+
     def _decompress_gzipped_file(self, gzipped_file_path: str) -> str:
         """
         Decompresses a gzipped file.
@@ -1300,13 +1345,13 @@ class Client:
             os.rename(temp_decompressed_path, decompressed_target_path)
             return decompressed_target_path
         except (gzip.BadGzipFile, EOFError, IOError) as e:
-            print(
+            self._logger.warning(
                 f"ERROR: Failed to decompress {gzipped_file_path}: {e}. Original file kept."
             )
         except (
             Exception
         ) as e:  # Catch other errors like permission issues during rename/remove
-            print(
+            self._logger.warning(
                 f"ERROR: Error during post-decompression file operations for {gzipped_file_path}: {e}. Original file kept."
             )
         finally:
@@ -1432,24 +1477,6 @@ def _budget_matches_list(budget_part: str, all_budgets: List[str]) -> List[str]:
     return [budget for budget in all_budgets if lowered_budget_part in budget.lower()]
 
 
-def _filter_upload_files(directory: str, upload_filter: str) -> List[str]:
-    """
-    Filter files in a directory based on the upload filter.
-    :param directory: Directory to filter files from.
-    :param upload_filter: Regular expression filter for file names.
-    :return: List of filtered file paths.
-    """
-    if not os.path.exists(directory):
-        raise CloudInputError(f"Directory {directory} does not exist")
-
-    regex = re.compile(upload_filter)
-    filtered_files = []
-    for file in os.listdir(directory):
-        if regex.match(file):
-            filtered_files.append(os.path.join(directory, file))
-    return filtered_files
-
-
 def replace_case_str_values(client: Client, case: Case) -> Case:
     """Create a new case object using internal integer IDs instead of string values."""
     # Model Version

psr/cloud/version.py

@@ -2,4 +2,4 @@
 # Unauthorized copying of this file, via any medium is strictly prohibited
 # Proprietary and confidential
 
-__version__ = "0.3.9"
+__version__ = "0.3.10"

psr/execqueue/config.py

@@ -4,6 +4,7 @@ import tomllib
 __version__ = "0.3.0"
 _app_name = "PSR Factory ExecQueue"
 DEFAULT_PORT = 5000
+DEFAULT_HOST = "127.0.0.1"
 FLASK_DEBUG = False
 _SETTINGS_FILE_PATH = "server_settings.toml"
 

psr/execqueue/server.py

@@ -403,7 +403,7 @@ if __name__ == '__main__':
     print("Starting server...")
     session = initialize_db()
     try:
-        app.run(debug=FLASK_DEBUG,
+        app.run(host=settings.get("host", DEFAULT_HOST), debug=FLASK_DEBUG,
                 port=settings.get("port", DEFAULT_PORT),
                 threaded=True,
                 use_reloader=False,)

psr/execqueue/watcher.py

@@ -12,7 +12,7 @@ SERVER_URL = os.getenv("SERVER_URL", "http://127.0.0.1:5000")
 WATCH_DIR = os.getenv("WATCH_DIR")
 PROCESSED_DIR = os.getenv("PROCESSED_DIR")
 RESULTS_DIR = os.getenv("RESULTS_DIR", "results")
-SLEEP_SECONDS = int(os.getenv("WATCHER_SLEEP", "30"))
+SLEEP_SECONDS = int(os.getenv("WATCHER_SLEEP", "10"))
 DB_PATH = os.getenv("WATCHER_DB_PATH", "watcher.sqlite")
 
 

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.0b32"
+__version__ = "5.0.0b36"
 
 from .api import *

{psr_factory-5.0.0b32.dist-info → psr_factory-5.0.0b36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psr-factory
-Version: 5.0.0b32
+Version: 5.0.0b36
 Summary: PSR database management module.
 Author-email: "PSR Inc." <psrfactory@psr-inc.com>
 License-Expression: MIT
@@ -33,6 +33,7 @@ Requires-Dist: filelock; extra == "cloud"
 Requires-Dist: pefile; extra == "cloud"
 Requires-Dist: boto3; extra == "cloud"
 Requires-Dist: botocore; extra == "cloud"
+Requires-Dist: tqdm; extra == "cloud"
 Provides-Extra: execqueue-client
 Requires-Dist: requests; extra == "execqueue-client"
 Provides-Extra: execqueue-server
@@ -55,3 +56,69 @@ Requires-Dist: pefile; extra == "all"
 Requires-Dist: boto3; extra == "all"
 Requires-Dist: botocore; extra == "all"
 Dynamic: license-file
+
+PSR Factory (version 4.0.40)
+============================
+
+Factory is a library that helps to manage SDDP cases. 
+It contains functions that create, load, and save studies, and also functions that create,
+access, and modify objects in a study.
+
+
+Installation
+------------
+
+### System-wide installation
+
+Open the command prompt and run the following command:
+
+```bash
+pip install psr_factory-4.0.40-py3-none-win_amd64.whl
+```
+
+Factory will be available to all Python scripts in your system after importing it:
+
+```python
+import psr.factory
+```
+
+### Local/project-specific usage
+
+Copy the folder `psr` and its contents to your project folder or a specific folder (e.g., `C:\path\to\factory`). Then, in your Python script, add the following lines:
+
+```python
+import sys
+sys.path.append(r"C:\path\to\factory")
+import psr.factory
+```
+
+
+Usage sample
+------------
+
+```python
+import psr.factory
+
+study = psr.factory.load_study(r"C:\temp\my\study")
+system_1 = study.find("System.*")[0]
+
+battery = psr.factory.create("Battery")
+battery.code = 1
+battery.name = "Battery 1"
+battery.set("InstalledCapacity", 10.0)
+battery.set("RefSystem", system_1)
+study.add(battery)
+
+study.save(r"C:\temp\my\updated_study")
+```
+
+
+Full documentation
+------------------
+
+The full documentation and reference is available at [https://docs.psr-inc.com/factory/](https://docs.psr-inc.com/manual/factory/).
+
+Releases
+--------
+
+New releases can be found in the release notes at [https://psrenergy-docs.github.io/factory/releases.html](https://psrenergy-docs.github.io/factory/releases.html).

{psr_factory-5.0.0b32.dist-info → psr_factory-5.0.0b36.dist-info}/RECORD

@@ -2,23 +2,23 @@ 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=aq3yqDC_D1tplPICqa39pmMbyp_liRQ8B_Ubbl7q2Dw,7048
-psr/cloud/cloud.py,sha256=XnTYk5t27iTbbkfyQtD9gjIDUM2aNEly0-AHhaOpktw,60368
+psr/cloud/aws.py,sha256=lpfaP2qUq5s7Gffb-k2jwyCP00BhvbB13y1nTTvM1dU,10249
+psr/cloud/cloud.py,sha256=4NpJkVriVJHuBVDi8ubezcQ835vPfWTTbPpG_BBsDfE,61575
 psr/cloud/data.py,sha256=oDJyzcNsA7aAYi_qJKCUjCeGZvN-25E8KjZ-5RamNLE,4160
 psr/cloud/desktop.py,sha256=JFroCMEFV1Nz3has74n7OVrGCg2lS7Ev5bcjdw2hRxY,2980
 psr/cloud/log.py,sha256=Dvhz1enIWlFWeaRK7JAAuZVPfODgoEIRNcHEmbEliyQ,1366
 psr/cloud/status.py,sha256=vcI4B9S6wCt9maT5NNrVwYaEgGIvy6kkC1UVpJjYbtw,3607
 psr/cloud/tempfile.py,sha256=1IOeye0eKWnmBynK5K5FMWiTaEVhn4GbQ8_y0THEva0,3893
-psr/cloud/version.py,sha256=jwq5nQsan38iZF0lj5GFK7l9EIe4aSF1NzdcupAfHP4,192
+psr/cloud/version.py,sha256=-oC5DNaS_iYTfpsusfmeG-WGktZ5b-x8xT-4zszWvz8,193
 psr/cloud/xml.py,sha256=ac2lyflOQm8khPvJn0zmI26I4sfUDY6A_OTsxzbMQEs,1896
 psr/execqueue/client.py,sha256=P89Yt76W2GqRXaG_MLsa0kXf0jPp-weBd3aSTRcDzcs,4443
-psr/execqueue/config.py,sha256=3KVwASOgRlymOSPeabotgBdLVB5sPKnPQ9og2q3LQfw,1418
+psr/execqueue/config.py,sha256=rUOzO5dtTkwWoZlZfk06K9RE94xCx53T1bJ1h5JaDUo,1446
 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=lYK_-FqnoMfNtG-BWVrfdHP7dQOFqGXl5GbHYv6ENJg,219
+psr/execqueue/server.py,sha256=LolYERWRt96P_ip4yKU7DsN7M_n9d_pbflbT0ckUV0E,15782
+psr/execqueue/watcher.py,sha256=R1dyXJ-OYn_QjqdItBwbLJZQ2LcbtdHqnRaYkyphi4w,5637
+psr/factory/__init__.py,sha256=lItGdpqHejAKmFze9F9LK5wf2reJToeK9ZEKvke6WaE,219
 psr/factory/api.py,sha256=QASwrk5SbbAqz63u7EhGoBBqqXOqMnicjL-eJ3gOGe0,104270
-psr/factory/factory.dll,sha256=81JoLaZBp9AM1ZIwjLfft7xAau9Djh6s7fNRPQjP5-w,18362192
+psr/factory/factory.dll,sha256=960_HytvI81_q4jM0wSyIkE8iosfPPOl96NHzP-rNDw,18362192
 psr/factory/factory.pmd,sha256=kr5xf2knYu_SJeyCsmoyYVgFwd4-VURi28rno40GIRY,250936
 psr/factory/factory.pmk,sha256=OvpqDnaCc1eeOWGQxogD0Nbg9M0PE1UZPcD65PeePV8,580337
 psr/factory/factorylib.py,sha256=o5Irbw6k-yIOJVUtDu2YYqw2x16P2LmCdouImwSssdw,28290
@@ -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.0b32.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
-psr_factory-5.0.0b32.dist-info/METADATA,sha256=TyeuvA05pyZSMHbFxavpNmDAxyfVs5fednEN8zIhY2k,2333
-psr_factory-5.0.0b32.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
-psr_factory-5.0.0b32.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
-psr_factory-5.0.0b32.dist-info/RECORD,,
+psr_factory-5.0.0b36.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
+psr_factory-5.0.0b36.dist-info/METADATA,sha256=rKr2yS66SWjgNP54XAv_ed7aIL83LeecoBO8TgIlPpk,3996
+psr_factory-5.0.0b36.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
+psr_factory-5.0.0b36.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
+psr_factory-5.0.0b36.dist-info/RECORD,,