edsl 0.1.50__py3-none-any.whl → 0.1.52__py3-none-any.whl

edsl/jobs/jobs.py

@@ -620,7 +620,7 @@ class Jobs(Base):
         if jh.use_remote_inference(self.run_config.parameters.disable_remote_inference):
             job_info: RemoteJobInfo = self._start_remote_inference_job(jh)
             if background:
-                from edsl.results import Results
+                from ..results import Results
 
                 results = Results.from_job_info(job_info)
                 return results, None
@@ -881,7 +881,7 @@ class Jobs(Base):
             ],
         }
         if add_edsl_version:
-            from edsl import __version__
+            from .. import __version__
 
             d["edsl_version"] = __version__
             d["edsl_class_name"] = "Jobs"

edsl/jobs/jobs_checks.py

@@ -3,7 +3,7 @@ Checks a Jobs object for missing API keys and other requirements.
 """
 
 import os
-from edsl.key_management.key_lookup_builder import MissingAPIKeyError
+from ..key_management.key_lookup_builder import MissingAPIKeyError
 
 
 class JobsChecks:
@@ -16,7 +16,7 @@ class JobsChecks:
         self.jobs = jobs
 
     def check_api_keys(self) -> None:
-        from edsl.language_models.model import Model
+        from ..language_models.model import Model
 
         if len(self.jobs.models) == 0:
             models = [Model()]
@@ -37,7 +37,7 @@ class JobsChecks:
         """
         missing_api_keys = set()
 
-        from edsl.enums import service_to_api_keyname
+        from ..enums import service_to_api_keyname
 
         for model in self.jobs.models: # + [Model()]:
             if not model.has_valid_api_key():
@@ -134,8 +134,8 @@ class JobsChecks:
     def key_process(self):
         import secrets
         from dotenv import load_dotenv
-        from edsl.coop.coop import Coop
-        from edsl.utilities.utilities import write_api_key_to_env
+        from ..coop.coop import Coop
+        from ..utilities.utilities import write_api_key_to_env
 
         missing_api_keys = self.get_missing_api_keys()
 

edsl/jobs/jobs_component_constructor.py

@@ -140,8 +140,8 @@ class JobsComponentConstructor:
 
     @staticmethod
     def _get_empty_container_object(object):
-        from edsl.agents import AgentList
-        from edsl.scenarios import ScenarioList
+        from ..agents import AgentList
+        from ..scenarios import ScenarioList
 
         return {"Agent": AgentList([]), "Scenario": ScenarioList([])}.get(
             object.__class__.__name__, []

edsl/jobs/jobs_pricing_estimation.py

@@ -137,7 +137,7 @@ class JobsPrompts:
     def price_lookup(self) -> dict:
         """Fetches the price lookup from Coop if it is not already cached."""
         if self._price_lookup is None:
-            from edsl.coop.coop import Coop
+            from ..coop.coop import Coop
 
             c = Coop()
             self._price_lookup = c.fetch_prices()

edsl/jobs/jobs_runner_asyncio.py

@@ -186,7 +186,7 @@ class JobsRunnerAsyncio:
         self.start_time = time.monotonic()
         self.completed = False
 
-        from edsl.coop import Coop
+        from ..coop import Coop
 
         coop = Coop()
         endpoint_url = coop.get_progress_bar_url()
@@ -273,7 +273,7 @@ class JobsRunnerAsyncio:
             # breakpoint()
             results.bucket_collection = self.environment.bucket_collection
 
-            from edsl.jobs.results_exceptions_handler import ResultsExceptionsHandler
+            from .results_exceptions_handler import ResultsExceptionsHandler
 
             results_exceptions_handler = ResultsExceptionsHandler(results, parameters)
 

edsl/jobs/jobs_status_enums.py

@@ -5,5 +5,6 @@ class JobsStatus(Enum):
     QUEUED = "queued"
     RUNNING = "running"
     COMPLETED = "completed"
+    PARTIALLY_FAILED = "partially_failed"
     FAILED = "failed"
     CANCELLED = "cancelled"

edsl/jobs/remote_inference.py

@@ -43,7 +43,7 @@ class JobsRemoteInferenceHandler:
         self.verbose = verbose
         self.poll_interval = poll_interval
 
-        from edsl.config import CONFIG
+        from ..config import CONFIG
 
         self.expected_parrot_url = CONFIG.get("EXPECTED_PARROT_URL")
         self.remote_inference_url = f"{self.expected_parrot_url}/home/remote-inference"
@@ -113,7 +113,7 @@ class JobsRemoteInferenceHandler:
         logger.add_info("job_uuid", job_uuid)
 
         logger.update(
-            f"Job details are available at your Coop account {self.remote_inference_url}",
+            f"Job details are available at your Coop account. [Go to Remote Inference page]({self.remote_inference_url})",
             status=JobsStatus.RUNNING,
         )
         progress_bar_url = (
@@ -121,7 +121,7 @@ class JobsRemoteInferenceHandler:
         )
         logger.add_info("progress_bar_url", progress_bar_url)
         logger.update(
-            f"View job progress here: {progress_bar_url}", status=JobsStatus.RUNNING
+            f"View job progress [here]({progress_bar_url})", status=JobsStatus.RUNNING
         )
 
         return RemoteJobInfo(
@@ -169,7 +169,7 @@ class JobsRemoteInferenceHandler:
             message="Job cancelled by the user.", status=JobsStatus.CANCELLED
         )
         job_info.logger.update(
-            f"See {self.expected_parrot_url}/home/remote-inference for more details.",
+            f"See [Remote Inference page]({self.expected_parrot_url}/home/remote-inference) for more details.",
             status=JobsStatus.CANCELLED,
         )
 
@@ -182,22 +182,45 @@ class JobsRemoteInferenceHandler:
         reason = remote_job_data.get("reason")
 
         if reason == "insufficient funds":
-            latest_error_report_url = "Error: Insufficient balance to start the job"
-            print("❌ Error: Insufficient balance to start the job")
+            job_info.logger.update(
+                f"Error: Insufficient balance to start the job. Add funds to your account at the [Credits page]({self.expected_parrot_url}/home/credits)",
+                status=JobsStatus.FAILED,
+            )
 
         if latest_error_report_url:
             job_info.logger.add_info("error_report_url", latest_error_report_url)
 
         job_info.logger.update("Job failed.", status=JobsStatus.FAILED)
         job_info.logger.update(
-            f"See {self.expected_parrot_url}/home/remote-inference for more details.",
+            f"See [Remote Inference page]({self.expected_parrot_url}/home/remote-inference) for more details.",
             status=JobsStatus.FAILED,
         )
         job_info.logger.update(
-            f"Need support? Visit Discord: {RemoteJobConstants.DISCORD_URL}",
+            f"Need support? [Visit Discord]({RemoteJobConstants.DISCORD_URL})",
             status=JobsStatus.FAILED,
         )
 
+    def _handle_partially_failed_job(
+        self, job_info: RemoteJobInfo, remote_job_data: RemoteInferenceResponse
+    ) -> None:
+        "Handles a partially failed job by logging the error and updating the job status."
+        latest_error_report_url = remote_job_data.get("latest_error_report_url")
+
+        if latest_error_report_url:
+            job_info.logger.add_info("error_report_url", latest_error_report_url)
+
+        job_info.logger.update(
+            "Job completed with partial results.", status=JobsStatus.PARTIALLY_FAILED
+        )
+        job_info.logger.update(
+            f"See [Remote Inference page]({self.expected_parrot_url}/home/remote-inference) for more details.",
+            status=JobsStatus.PARTIALLY_FAILED,
+        )
+        job_info.logger.update(
+            f"Need support? [Visit Discord]({RemoteJobConstants.DISCORD_URL})",
+            status=JobsStatus.PARTIALLY_FAILED,
+        )
+
     def _sleep_for_a_bit(self, job_info: RemoteJobInfo, status: str) -> None:
         import time
         from datetime import datetime
@@ -212,6 +235,7 @@ class JobsRemoteInferenceHandler:
     def _fetch_results_and_log(
         self,
         job_info: RemoteJobInfo,
+        job_status: Literal["failed", "partial_failed", "completed"],
         results_uuid: str,
         remote_job_data: RemoteInferenceResponse,
         object_fetcher: Callable,
@@ -221,10 +245,17 @@ class JobsRemoteInferenceHandler:
         results = object_fetcher(results_uuid, expected_object_type="results")
         results_url = remote_job_data.get("results_url")
         job_info.logger.add_info("results_url", results_url)
-        job_info.logger.update(
-            f"Job completed and Results stored on Coop: {results_url}",
-            status=JobsStatus.COMPLETED,
-        )
+
+        if job_status == "completed":
+            job_info.logger.update(
+                f"Job completed and Results stored on Coop. [View Results]({results_url})",
+                status=JobsStatus.COMPLETED,
+            )
+        elif job_status == "partial_failed":
+            job_info.logger.update(
+                f"View partial results [here]({results_url})",
+                status=JobsStatus.PARTIALLY_FAILED,
+            )
         results.job_uuid = job_info.job_uuid
         results.results_uuid = results_uuid
         return results
@@ -244,13 +275,16 @@ class JobsRemoteInferenceHandler:
             return None, reason
 
         elif status == "failed" or status == "completed" or status == "partial_failed":
-            if status == "failed" or status == "partial_failed":
+            if status == "failed":
                 self._handle_failed_job(job_info, remote_job_data)
+            elif status == "partial_failed":
+                self._handle_partially_failed_job(job_info, remote_job_data)
 
             results_uuid = remote_job_data.get("results_uuid")
             if results_uuid:
                 results = self._fetch_results_and_log(
                     job_info=job_info,
+                    job_status=status,
                     results_uuid=results_uuid,
                     remote_job_data=remote_job_data,
                     object_fetcher=object_fetcher,

edsl/jobs/results_exceptions_handler.py

@@ -1,8 +1,8 @@
 from typing import Protocol
 import sys
 #from edsl.scenarios.FileStore import HTMLFileStore
-from edsl.config import CONFIG
-from edsl.coop.coop import Coop
+from ..config import CONFIG
+from ..coop.coop import Coop
 from ..scenarios import FileStore
 from .exceptions import JobsErrors