Permanently enable mid agreement payments (#244)

golemfactory · May 22, 2024 · e5a3661 · e5a3661
1 parent 7f3c4cf
commit e5a3661
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 30 deletions.
diff --git a/ray_on_golem/server/models.py b/ray_on_golem/server/models.py
@@ -36,7 +36,7 @@ class Config:
 
 
 class PaymentIntervalHours(BaseModel):
-    minimal: float
+    minimal: float = 12
     optimal: float = None
 
     @validator("optimal", always=True, pre=True)
@@ -57,7 +57,7 @@ class BudgetControlData(BaseModel):
     max_cpu_per_hour_price: Optional[float] = None
     max_env_per_hour_price: Optional[float] = None
 
-    payment_interval_hours: Optional[PaymentIntervalHours] = None
+    payment_interval_hours: PaymentIntervalHours = Field(default_factory=PaymentIntervalHours)
 
     class Config:
         extra = "forbid"

diff --git a/ray_on_golem/server/services/golem/manager_stack.py b/ray_on_golem/server/services/golem/manager_stack.py
@@ -113,38 +113,35 @@ async def create(
         )
 
         proposal_negotiators = [PaymentPlatformNegotiator()]
-        if node_config.budget_control.payment_interval_hours is not None:
-            logger.debug(
-                "Adding mid agreement payments based on given payment_interval: %s",
-                node_config.budget_control.payment_interval_hours,
-            )
 
-            minimal_payment_timeout = timedelta(
-                hours=node_config.budget_control.payment_interval_hours.minimal
-            )
-            optimal_payment_timeout = timedelta(
-                hours=node_config.budget_control.payment_interval_hours.optimal
-            )
+        logger.debug(
+            "Adding mid agreement payments based on given payment_interval: %s",
+            node_config.budget_control.payment_interval_hours,
+        )
+        minimal_payment_timeout = timedelta(
+            hours=node_config.budget_control.payment_interval_hours.minimal
+        )
+        optimal_payment_timeout = timedelta(
+            hours=node_config.budget_control.payment_interval_hours.optimal
+        )
 
-            payloads.append(
-                PaymentInfo(
-                    debit_notes_accept_timeout=int(
-                        DEFAULT_DEBIT_NOTES_ACCEPT_TIMEOUT.total_seconds()
-                    ),
-                    debit_notes_interval=int(DEFAULT_DEBIT_NOTE_INTERVAL.total_seconds()),
-                    payment_timeout=int(minimal_payment_timeout.total_seconds()),
-                )
+        payloads.append(
+            PaymentInfo(
+                debit_notes_accept_timeout=int(DEFAULT_DEBIT_NOTES_ACCEPT_TIMEOUT.total_seconds()),
+                debit_notes_interval=int(DEFAULT_DEBIT_NOTE_INTERVAL.total_seconds()),
+                payment_timeout=int(minimal_payment_timeout.total_seconds()),
             )
-            demand_lifetime = DEFAULT_LONG_RUNNING_DEMAND_LIFETIME
-
-            proposal_negotiators.append(
-                MidAgreementPaymentsNegotiator(
-                    min_debit_note_interval=DEFAULT_DEBIT_NOTE_INTERVAL,
-                    optimal_debit_note_interval=DEFAULT_DEBIT_NOTE_INTERVAL,
-                    min_payment_timeout=minimal_payment_timeout,
-                    optimal_payment_timeout=optimal_payment_timeout,
-                )
+        )
+        demand_lifetime = DEFAULT_LONG_RUNNING_DEMAND_LIFETIME
+
+        proposal_negotiators.append(
+            MidAgreementPaymentsNegotiator(
+                min_debit_note_interval=DEFAULT_DEBIT_NOTE_INTERVAL,
+                optimal_debit_note_interval=DEFAULT_DEBIT_NOTE_INTERVAL,
+                min_payment_timeout=minimal_payment_timeout,
+                optimal_payment_timeout=optimal_payment_timeout,
             )
+        )
 
         demand_manager = stack.add_manager(
             RefreshingDemandManager(