add example with rich text; fix generation of system type field

atproto/codegen/models/generator.py

@@ -319,8 +319,11 @@ def _generate_def_model(nsid: NSID, def_name: str, def_model: models.LexObject,
         _get_model(nsid, def_model),
     ]
 
+    def_type = f'{nsid}#{def_name}'
     if def_name == 'main':
-        lines.append(f"{_(1)}_type: str = '{nsid}'")
+        def_type = str(nsid)
+
+    lines.append(f"{_(1)}_type: str = '{def_type}'")
 
     lines.append('')
 

atproto/xrpc_client/models/app/bsky/actor/defs.py

@@ -33,6 +33,8 @@ class ProfileViewBasic(base.ModelBase):
     labels: Optional[List['models.ComAtprotoLabelDefs.Label']] = None
     viewer: Optional['models.AppBskyActorDefs.ViewerState'] = None
 
+    _type: str = 'app.bsky.actor.defs#profileViewBasic'
+
 
 @dataclass
 class ProfileView(base.ModelBase):
@@ -59,6 +61,8 @@ class ProfileView(base.ModelBase):
     labels: Optional[List['models.ComAtprotoLabelDefs.Label']] = None
     viewer: Optional['models.AppBskyActorDefs.ViewerState'] = None
 
+    _type: str = 'app.bsky.actor.defs#profileView'
+
 
 @dataclass
 class ProfileViewDetailed(base.ModelBase):
@@ -93,6 +97,8 @@ class ProfileViewDetailed(base.ModelBase):
     postsCount: Optional[int] = None
     viewer: Optional['models.AppBskyActorDefs.ViewerState'] = None
 
+    _type: str = 'app.bsky.actor.defs#profileViewDetailed'
+
 
 @dataclass
 class ViewerState(base.ModelBase):
@@ -112,3 +118,5 @@ class ViewerState(base.ModelBase):
     followedBy: Optional[str] = None
     following: Optional[str] = None
     muted: Optional[bool] = None
+
+    _type: str = 'app.bsky.actor.defs#viewerState'

atproto/xrpc_client/models/app/bsky/embed/external.py

@@ -44,6 +44,8 @@ class External(base.ModelBase):
     uri: str
     thumb: Optional[BlobRef] = None
 
+    _type: str = 'app.bsky.embed.external#external'
+
 
 @dataclass
 class View(base.ModelBase):
@@ -56,6 +58,8 @@ class View(base.ModelBase):
 
     external: 'models.AppBskyEmbedExternal.ViewExternal'
 
+    _type: str = 'app.bsky.embed.external#view'
+
 
 @dataclass
 class ViewExternal(base.ModelBase):
@@ -73,3 +77,5 @@ class ViewExternal(base.ModelBase):
     title: str
     uri: str
     thumb: Optional[str] = None
+
+    _type: str = 'app.bsky.embed.external#viewExternal'

atproto/xrpc_client/models/app/bsky/embed/images.py

@@ -40,6 +40,8 @@ class Image(base.ModelBase):
     alt: str
     image: BlobRef
 
+    _type: str = 'app.bsky.embed.images#image'
+
 
 @dataclass
 class View(base.ModelBase):
@@ -52,6 +54,8 @@ class View(base.ModelBase):
 
     images: List['models.AppBskyEmbedImages.ViewImage']
 
+    _type: str = 'app.bsky.embed.images#view'
+
 
 @dataclass
 class ViewImage(base.ModelBase):
@@ -67,3 +71,5 @@ class ViewImage(base.ModelBase):
     alt: str
     fullsize: str
     thumb: str
+
+    _type: str = 'app.bsky.embed.images#viewImage'

atproto/xrpc_client/models/app/bsky/embed/record.py

@@ -42,6 +42,8 @@ class View(base.ModelBase):
         'Dict[str, Any]',
     ]
 
+    _type: str = 'app.bsky.embed.record#view'
+
 
 @dataclass
 class ViewRecord(base.ModelBase):
@@ -76,6 +78,8 @@ class ViewRecord(base.ModelBase):
     ] = None
     labels: Optional[List['models.ComAtprotoLabelDefs.Label']] = None
 
+    _type: str = 'app.bsky.embed.record#viewRecord'
+
 
 @dataclass
 class ViewNotFound(base.ModelBase):
@@ -88,6 +92,8 @@ class ViewNotFound(base.ModelBase):
 
     uri: str
 
+    _type: str = 'app.bsky.embed.record#viewNotFound'
+
 
 @dataclass
 class ViewBlocked(base.ModelBase):
@@ -99,3 +105,5 @@ class ViewBlocked(base.ModelBase):
     """
 
     uri: str
+
+    _type: str = 'app.bsky.embed.record#viewBlocked'

atproto/xrpc_client/models/app/bsky/embed/record_with_media.py

@@ -40,3 +40,5 @@ class View(base.ModelBase):
 
     media: Union['models.AppBskyEmbedImages.View', 'models.AppBskyEmbedExternal.View', 'Dict[str, Any]']
     record: 'models.AppBskyEmbedRecord.View'
+
+    _type: str = 'app.bsky.embed.recordWithMedia#view'

atproto/xrpc_client/models/app/bsky/feed/defs.py

@@ -51,6 +51,8 @@ class PostView(base.ModelBase):
     repostCount: Optional[int] = None
     viewer: Optional['models.AppBskyFeedDefs.ViewerState'] = None
 
+    _type: str = 'app.bsky.feed.defs#postView'
+
 
 @dataclass
 class ViewerState(base.ModelBase):
@@ -65,6 +67,8 @@ class ViewerState(base.ModelBase):
     like: Optional[str] = None
     repost: Optional[str] = None
 
+    _type: str = 'app.bsky.feed.defs#viewerState'
+
 
 @dataclass
 class FeedViewPost(base.ModelBase):
@@ -81,6 +85,8 @@ class FeedViewPost(base.ModelBase):
     reason: Optional[Union['models.AppBskyFeedDefs.ReasonRepost', 'Dict[str, Any]']] = None
     reply: Optional['models.AppBskyFeedDefs.ReplyRef'] = None
 
+    _type: str = 'app.bsky.feed.defs#feedViewPost'
+
 
 @dataclass
 class ReplyRef(base.ModelBase):
@@ -95,6 +101,8 @@ class ReplyRef(base.ModelBase):
     parent: 'models.AppBskyFeedDefs.PostView'
     root: 'models.AppBskyFeedDefs.PostView'
 
+    _type: str = 'app.bsky.feed.defs#replyRef'
+
 
 @dataclass
 class ReasonRepost(base.ModelBase):
@@ -109,6 +117,8 @@ class ReasonRepost(base.ModelBase):
     by: 'models.AppBskyActorDefs.ProfileViewBasic'
     indexedAt: str
 
+    _type: str = 'app.bsky.feed.defs#reasonRepost'
+
 
 @dataclass
 class ThreadViewPost(base.ModelBase):
@@ -141,6 +151,8 @@ class ThreadViewPost(base.ModelBase):
         ]
     ] = None
 
+    _type: str = 'app.bsky.feed.defs#threadViewPost'
+
 
 @dataclass
 class NotFoundPost(base.ModelBase):
@@ -155,6 +167,8 @@ class NotFoundPost(base.ModelBase):
     notFound: bool
     uri: str
 
+    _type: str = 'app.bsky.feed.defs#notFoundPost'
+
 
 @dataclass
 class BlockedPost(base.ModelBase):
@@ -168,3 +182,5 @@ class BlockedPost(base.ModelBase):
 
     blocked: bool
     uri: str
+
+    _type: str = 'app.bsky.feed.defs#blockedPost'

atproto/xrpc_client/models/app/bsky/feed/get_likes.py

@@ -62,3 +62,5 @@ class Like(base.ModelBase):
     actor: 'models.AppBskyActorDefs.ProfileView'
     createdAt: str
     indexedAt: str
+
+    _type: str = 'app.bsky.feed.getLikes#like'

atproto/xrpc_client/models/app/bsky/feed/post.py

@@ -25,6 +25,8 @@ class ReplyRef(base.ModelBase):
     parent: 'models.ComAtprotoRepoStrongRef.Main'
     root: 'models.ComAtprotoRepoStrongRef.Main'
 
+    _type: str = 'app.bsky.feed.post#replyRef'
+
 
 @dataclass
 class Entity(base.ModelBase):
@@ -41,6 +43,8 @@ class Entity(base.ModelBase):
     type: str
     value: str
 
+    _type: str = 'app.bsky.feed.post#entity'
+
 
 @dataclass
 class TextSlice(base.ModelBase):
@@ -55,6 +59,8 @@ class TextSlice(base.ModelBase):
     end: int
     start: int
 
+    _type: str = 'app.bsky.feed.post#textSlice'
+
 
 @dataclass
 class Main(base.RecordModelBase):

atproto/xrpc_client/models/app/bsky/notification/list_notifications.py

@@ -68,3 +68,5 @@ class Notification(base.ModelBase):
     uri: str
     labels: Optional[List['models.ComAtprotoLabelDefs.Label']] = None
     reasonSubject: Optional[str] = None
+
+    _type: str = 'app.bsky.notification.listNotifications#notification'

atproto/xrpc_client/models/app/bsky/richtext/facet.py

@@ -39,6 +39,8 @@ class Mention(base.ModelBase):
 
     did: str
 
+    _type: str = 'app.bsky.richtext.facet#mention'
+
 
 @dataclass
 class Link(base.ModelBase):
@@ -51,6 +53,8 @@ class Link(base.ModelBase):
 
     uri: str
 
+    _type: str = 'app.bsky.richtext.facet#link'
+
 
 @dataclass
 class ByteSlice(base.ModelBase):
@@ -64,3 +68,5 @@ class ByteSlice(base.ModelBase):
 
     byteEnd: int
     byteStart: int
+
+    _type: str = 'app.bsky.richtext.facet#byteSlice'