Delete deprecated record models called "Main" instead of "Record" (#323)

packages/atproto_client/models/app/bsky/actor/profile.py

@@ -32,20 +32,6 @@ class Record(base.RecordModelBase):
     py_type: t.Literal['app.bsky.actor.profile'] = Field(default='app.bsky.actor.profile', alias='$type', frozen=True)
 
 
-class Main(Record):
-    def __init_subclass__(cls, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init_subclass__(**data)
-
-    def __init__(self, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init__(**data)
-
-
 class GetRecordResponse(base.SugarResponseModelBase):
     """Get record response for :obj:`models.AppBskyActorProfile.Record`."""
 

packages/atproto_client/models/app/bsky/feed/generator.py

@@ -37,20 +37,6 @@ class Record(base.RecordModelBase):
     py_type: t.Literal['app.bsky.feed.generator'] = Field(default='app.bsky.feed.generator', alias='$type', frozen=True)
 
 
-class Main(Record):
-    def __init_subclass__(cls, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init_subclass__(**data)
-
-    def __init__(self, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init__(**data)
-
-
 class GetRecordResponse(base.SugarResponseModelBase):
     """Get record response for :obj:`models.AppBskyFeedGenerator.Record`."""
 

packages/atproto_client/models/app/bsky/feed/like.py

@@ -23,20 +23,6 @@ class Record(base.RecordModelBase):
     py_type: t.Literal['app.bsky.feed.like'] = Field(default='app.bsky.feed.like', alias='$type', frozen=True)
 
 
-class Main(Record):
-    def __init_subclass__(cls, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init_subclass__(**data)
-
-    def __init__(self, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init__(**data)
-
-
 class GetRecordResponse(base.SugarResponseModelBase):
     """Get record response for :obj:`models.AppBskyFeedLike.Record`."""
 

packages/atproto_client/models/app/bsky/feed/post.py

@@ -85,20 +85,6 @@ class Record(base.RecordModelBase):
     py_type: t.Literal['app.bsky.feed.post'] = Field(default='app.bsky.feed.post', alias='$type', frozen=True)
 
 
-class Main(Record):
-    def __init_subclass__(cls, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init_subclass__(**data)
-
-    def __init__(self, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init__(**data)
-
-
 class GetRecordResponse(base.SugarResponseModelBase):
     """Get record response for :obj:`models.AppBskyFeedPost.Record`."""
 

packages/atproto_client/models/app/bsky/feed/repost.py

@@ -23,20 +23,6 @@ class Record(base.RecordModelBase):
     py_type: t.Literal['app.bsky.feed.repost'] = Field(default='app.bsky.feed.repost', alias='$type', frozen=True)
 
 
-class Main(Record):
-    def __init_subclass__(cls, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init_subclass__(**data)
-
-    def __init__(self, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init__(**data)
-
-
 class GetRecordResponse(base.SugarResponseModelBase):
     """Get record response for :obj:`models.AppBskyFeedRepost.Record`."""
 

packages/atproto_client/models/app/bsky/feed/threadgate.py

@@ -64,20 +64,6 @@ class Record(base.RecordModelBase):
     )
 
 
-class Main(Record):
-    def __init_subclass__(cls, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init_subclass__(**data)
-
-    def __init__(self, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init__(**data)
-
-
 class GetRecordResponse(base.SugarResponseModelBase):
     """Get record response for :obj:`models.AppBskyFeedThreadgate.Record`."""
 

packages/atproto_client/models/app/bsky/graph/block.py

@@ -23,20 +23,6 @@ class Record(base.RecordModelBase):
     py_type: t.Literal['app.bsky.graph.block'] = Field(default='app.bsky.graph.block', alias='$type', frozen=True)
 
 
-class Main(Record):
-    def __init_subclass__(cls, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init_subclass__(**data)
-
-    def __init__(self, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init__(**data)
-
-
 class GetRecordResponse(base.SugarResponseModelBase):
     """Get record response for :obj:`models.AppBskyGraphBlock.Record`."""
 

packages/atproto_client/models/app/bsky/graph/follow.py

@@ -23,20 +23,6 @@ class Record(base.RecordModelBase):
     py_type: t.Literal['app.bsky.graph.follow'] = Field(default='app.bsky.graph.follow', alias='$type', frozen=True)
 
 
-class Main(Record):
-    def __init_subclass__(cls, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init_subclass__(**data)
-
-    def __init__(self, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init__(**data)
-
-
 class GetRecordResponse(base.SugarResponseModelBase):
     """Get record response for :obj:`models.AppBskyGraphFollow.Record`."""
 

packages/atproto_client/models/app/bsky/graph/list.py

@@ -34,20 +34,6 @@ class Record(base.RecordModelBase):
     py_type: t.Literal['app.bsky.graph.list'] = Field(default='app.bsky.graph.list', alias='$type', frozen=True)
 
 
-class Main(Record):
-    def __init_subclass__(cls, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init_subclass__(**data)
-
-    def __init__(self, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init__(**data)
-
-
 class GetRecordResponse(base.SugarResponseModelBase):
     """Get record response for :obj:`models.AppBskyGraphList.Record`."""
 

packages/atproto_client/models/app/bsky/graph/listblock.py

@@ -25,20 +25,6 @@ class Record(base.RecordModelBase):
     )
 
 
-class Main(Record):
-    def __init_subclass__(cls, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init_subclass__(**data)
-
-    def __init__(self, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init__(**data)
-
-
 class GetRecordResponse(base.SugarResponseModelBase):
     """Get record response for :obj:`models.AppBskyGraphListblock.Record`."""
 

packages/atproto_client/models/app/bsky/graph/listitem.py

@@ -24,20 +24,6 @@ class Record(base.RecordModelBase):
     py_type: t.Literal['app.bsky.graph.listitem'] = Field(default='app.bsky.graph.listitem', alias='$type', frozen=True)
 
 
-class Main(Record):
-    def __init_subclass__(cls, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init_subclass__(**data)
-
-    def __init__(self, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init__(**data)
-
-
 class GetRecordResponse(base.SugarResponseModelBase):
     """Get record response for :obj:`models.AppBskyGraphListitem.Record`."""
 

packages/atproto_client/models/app/bsky/labeler/service.py

@@ -29,20 +29,6 @@ class Record(base.RecordModelBase):
     )
 
 
-class Main(Record):
-    def __init_subclass__(cls, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init_subclass__(**data)
-
-    def __init__(self, **data: t.Any) -> None:
-        import warnings
-
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init__(**data)
-
-
 class GetRecordResponse(base.SugarResponseModelBase):
     """Get record response for :obj:`models.AppBskyLabelerService.Record`."""
 

packages/atproto_client/models/utils.py

@@ -166,13 +166,9 @@ def is_record_type(model: t.Union[ModelBase, DotDict], expected_type: t.Union[st
     """
     if isinstance(expected_type, types.ModuleType):
         # for now, all records are defined in the Record class
-        # TODO(MarshalX): remove backward compatibility for Main
-        if not hasattr(expected_type, 'Main') or not hasattr(expected_type, 'Record'):
+        if not hasattr(expected_type, 'Record'):
             return False
 
-        if hasattr(expected_type, 'Main'):
-            expected_type = expected_type.Main.model_fields['py_type'].default
-
         if hasattr(expected_type, 'Record'):
             expected_type = expected_type.Record.model_fields['py_type'].default
 

packages/atproto_codegen/models/generator.py

@@ -509,20 +509,6 @@ def _generate_response_model(nsid: NSID, output_body: models.LexXrpcBody) -> str
     return _generate_xrpc_body_model(nsid, output_body, ModelType.RESPONSE)
 
 
-_MAIN_MODEL_BACKWARD_COMPATIBILITY = """
-class Main(Record):
-    def __init_subclass__(cls, **data: t.Any) -> None:
-        import warnings
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init_subclass__(**data)
-
-    def __init__(self, **data: t.Any) -> None:
-        import warnings
-        warnings.warn('Main class is deprecated. Use Record class instead.', DeprecationWarning, stacklevel=2)
-        super().__init__(**data)
-"""
-
-
 def _generate_def_model(nsid: NSID, def_name: str, def_model: models.LexObject, model_type: ModelType) -> str:
     lines = [
         _get_model_class_def(def_name, model_type),
@@ -537,10 +523,6 @@ def _generate_def_model(nsid: NSID, def_name: str, def_model: models.LexObject,
     lines.append(f"{_(1)}py_type: t.Literal['{def_type}'] = Field(default='{def_type}', alias='$type', frozen=True)")
     lines.append('')
 
-    # TODO(MarshalX): remove it
-    if model_type is ModelType.RECORD:
-        lines.append(_MAIN_MODEL_BACKWARD_COMPATIBILITY)
-
     return join_code(lines)