fix: pass preview pyrefly checks with explicit type narrowing

Author: codex

api/controllers/console/app/workflow.py

@@ -12,7 +12,6 @@
     ConfigDict,
     Field,
     RootModel,
-    ValidationError,
     field_validator,
     model_validator,
 )
@@ -663,7 +662,7 @@ def post(self, current_user: Account, app_model: App):
         elif "text/plain" in content_type:
             try:
                 args_model = SyncDraftWorkflowPayload.model_validate_json(request.data)
-            except (ValueError, ValidationError):
+            except ValueError:
                 raise InvalidArgumentError("Invalid JSON data")
         else:
             abort(415)

api/controllers/console/datasets/rag_pipeline/rag_pipeline_workflow.py

@@ -5,7 +5,7 @@
 
 from flask import abort, request
 from flask_restx import Resource
-from pydantic import BaseModel, Field, RootModel, ValidationError
+from pydantic import BaseModel, Field, RootModel
 from sqlalchemy.orm import Session, sessionmaker
 from werkzeug.exceptions import BadRequest, Forbidden, InternalServerError, NotFound
 
@@ -253,7 +253,7 @@ def post(self, current_user: Account, pipeline: Pipeline):
         elif "text/plain" in content_type:
             try:
                 payload = DraftWorkflowSyncPayload.model_validate_json(request.data)
-            except (ValueError, ValidationError):
+            except ValueError:
                 raise InvalidArgumentError("Invalid JSON data")
         else:
             abort(415)

api/controllers/console/explore/trial.py

@@ -81,7 +81,7 @@
 from controllers.console.remote_files import RemoteFileUploadPayload, upload_remote_file
 from controllers.console.wraps import cloud_edition_billing_resource_check, model_validate
 from controllers.web.error import InvokeRateLimitError as InvokeRateLimitHttpError
-from core.app.apps.agent_app.errors import AgentAppGeneratorError, AgentAppNotPublishedError
+from core.app.apps.agent_app.errors import AgentAppGeneratorError
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.errors.error import (
     AppInvokeQuotaExceededError,
@@ -668,7 +668,7 @@ def post(self, req_data: ChatRequest, request_context: RequestContext, trial_app
         except services.errors.app_model_config.AppModelConfigBrokenError:
             logger.exception("App model config broken.")
             raise AppUnavailableError()
-        except (AgentAppGeneratorError, AgentAppNotPublishedError):
+        except AgentAppGeneratorError:
             raise AppUnavailableError() from None
         except ProviderTokenNotInitError as ex:
             raise ProviderNotInitializeError(ex.description)

api/core/plugin/plugin_service.py

@@ -25,7 +25,7 @@
 from typing import Literal, Protocol
 
 import zstandard
-from pydantic import BaseModel, TypeAdapter, ValidationError
+from pydantic import BaseModel, TypeAdapter
 from redis import RedisError
 from redis.exceptions import LockError
 from sqlalchemy import delete, select, update
@@ -336,7 +336,7 @@ def _load_cached_plugin_model_providers_for_generation(
             try:
                 providers = cls._get_or_parse_plugin_model_providers_cache_payload(cached_providers)
                 return providers, True
-            except (TypeError, ValueError, ValidationError):
+            except (TypeError, ValueError):
                 logger.warning(
                     "Invalid cached plugin model providers for tenant %s; deleting cache key %s.",
                     tenant_id,

api/core/provider_manager.py

@@ -7,7 +7,6 @@
 from collections.abc import Callable, Sequence
 from dataclasses import asdict, dataclass
 from enum import StrEnum
-from json import JSONDecodeError
 from typing import TYPE_CHECKING, Any, Protocol, Self
 
 from pydantic import TypeAdapter, ValidationError
@@ -1493,7 +1492,7 @@ def _get_and_decrypt_credentials(
 
         try:
             credentials = _credentials_adapter.validate_json(encrypted_config)
-        except (ValueError, JSONDecodeError):
+        except ValueError:
             return {}
 
         # Decrypt secret variables
@@ -1795,7 +1794,7 @@ def _to_model_settings(
                                 provider_model_credentials = _credentials_adapter.validate_json(
                                     load_balancing_model_config.encrypted_config
                                 )
-                            except (ValueError, JSONDecodeError):
+                            except ValueError:
                                 continue
 
                             # Get decoding context for decrypting credentials

api/core/workflow/file_reference.py

@@ -62,7 +62,7 @@ def parse_file_reference(reference: str | None) -> FileReference | None:
     encoded_payload = reference.removeprefix(_FILE_REFERENCE_PREFIX)
     try:
         payload = json.loads(base64.urlsafe_b64decode(encoded_payload.encode()))
-    except (ValueError, json.JSONDecodeError):
+    except ValueError:
         return FileReference(record_id=reference)
 
     record_id = payload.get("record_id")

api/libs/oauth.py

@@ -99,7 +99,7 @@ def decode_oauth_state(state: str | None) -> OAuthState:
         padded_state = state + "=" * (-len(state) % 4)
         raw_state = base64.urlsafe_b64decode(padded_state.encode("ascii")).decode("utf-8")
         return OAUTH_STATE_ADAPTER.validate_python(json.loads(raw_state))
-    except (binascii.Error, ValueError, UnicodeDecodeError, json.JSONDecodeError, ValidationError):
+    except (binascii.Error, ValueError):
         return {}
 
 

api/libs/token.py

@@ -219,7 +219,6 @@ def _unauthorized():
         verified = PassportService().verify(csrf_token)
     except Exception:
         _unauthorized()
-        raise  # unreachable, but helps the type checker see verified is always bound
 
     if verified.get("sub") != user_id:
         _unauthorized()

api/repositories/data_source/credential_repository.py

@@ -3,7 +3,7 @@
 from collections.abc import Mapping
 from typing import cast
 
-from pydantic import TypeAdapter, ValidationError
+from pydantic import TypeAdapter
 from sqlalchemy import select, update
 from sqlalchemy.engine import CursorResult
 from sqlalchemy.orm import Session, sessionmaker
@@ -23,7 +23,7 @@ def _source_mapping(value: object) -> Mapping[str, object]:
         if isinstance(value, str):
             return _CREDENTIALS_ADAPTER.validate_json(value)
         return _CREDENTIALS_ADAPTER.validate_python(value)
-    except (TypeError, ValueError, ValidationError):
+    except (TypeError, ValueError):
         return {}
 
 

api/repositories/knowledge/document_repository.py

@@ -2,7 +2,7 @@
 
 from collections.abc import Mapping
 
-from pydantic import TypeAdapter, ValidationError
+from pydantic import TypeAdapter
 from sqlalchemy import exists, select, update
 from sqlalchemy.orm import Session, sessionmaker
 
@@ -27,7 +27,7 @@ def _mapping(value: object) -> Mapping[str, object] | None:
         if isinstance(value, str):
             return _MAPPING_ADAPTER.validate_json(value)
         return _MAPPING_ADAPTER.validate_python(value)
-    except (TypeError, ValueError, ValidationError):
+    except (TypeError, ValueError):
         return {}