Merge prod, keeping all our changes

Author: CarterPerez-dev

.gitignore

@@ -34,7 +34,7 @@ backend/.env.testing
 .env.development
 .env.production
 .env.testing
-.env
+*.env
 node_modules/
 my-react-app/build/
 AuthKey_8VA5M37ZZZ.p8

backend/api/domains/account/controllers/oauth/github_mobile_ctrl.py

@@ -13,10 +13,8 @@
 )
 
 from api.core.auth.jwt_auth import generate_tokens
-from api.core.validation.exceptions import ValidationError
-    
+
 from ...models.User import User
-from ...services.oauth import OAuthService
 from .shared_ctrl import process_oauth_user
 
 

backend/api/domains/account/routes/oauth/github_mobile.py

@@ -13,13 +13,9 @@
     RL,
     PG,
     RS,
-    S,
-    R,
     TracingGuard,
 )
 from ...controllers import handle_github_mobile_callback
-from ...middleware.schemas import GitHubOAuthRequest
-from ...middleware.rules import validate_oauth_state_match
 
 
 @account_ns.route("/oauth/github/mobile/callback")

backend/api/domains/referral/services/payout_ops.py

@@ -197,7 +197,7 @@ def process_user_payouts(user_id: str,
                     payout_repo.mark_as_paid(payout.id, transfer.id)
                     if payout.tracking_id:
                         tracking_repo = ReferralTrackingRepository(db)
-                        tracking_repo.update(payout.tracking_id, {"payout_status": "paid"})
+                        tracking_repo.update(payout.tracking_id, payout_status="paid")
 
                     transfer_ids.append(transfer.id)
                     total_amount += payout.amount
@@ -272,7 +272,7 @@ def mark_manual_payout_paid(
 
             if payout.tracking_id:
                 tracking_repo = ReferralTrackingRepository(db)
-                tracking_repo.update(payout.tracking_id, {"payout_status": "paid"})
+                tracking_repo.update(payout.tracking_id, payout_status="paid")
 
             current_app.logger.info(
                 f"Manually marked payout {payout_id} as paid via {payment_method}: ${payout.amount}"

backend/api/domains/tools/ollama/services/ollama_client.py

@@ -77,19 +77,20 @@ def generate(
         if model is None:
             model = DEFAULT_MODEL
 
+        opts: dict[str, Any] = {
+            "temperature": temperature,
+            **options
+        }
+        if num_predict is not None:
+            opts["num_predict"] = num_predict
+
         payload = {
             "model": model,
             "prompt": prompt,
             "stream": stream,
-            "options": {
-                "temperature": temperature,
-                **options
-            }
+            "options": opts
         }
 
-        if num_predict is not None:
-            payload["options"]["num_predict"] = num_predict
-
         if format:
             payload["format"] = format
         if system:

backend/devtools/migrations/.env.migrations

@@ -21,7 +21,7 @@
     "@react-navigation/native-stack": "^7.3.3",
     "@react-navigation/stack": "^7.2.3",
     "@reduxjs/toolkit": "2.6.1",
-    "axios": "1.8.3",
+    "axios": ">=1.12.0",
     "expo": "~52.0.41",
     "expo-apple-authentication": "7.1.3",
     "expo-blur": "14.0.3",