robin/oxibooru-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(models): removing unnecessary python classes

Browse source
This commit is contained in:
Scott Lyons 2024-08-15 09:13:19 -07:00
commit 669be07c68
2 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
szurubooru-client/src/lib.rs
View file

@ -47,15 +47,14 @@ use pyo3::prelude::*;
#[cfg(feature = "python")] #[cfg(feature = "python")]
#[cfg_attr(feature = "python", pymodule)] #[cfg_attr(feature = "python", pymodule)]
/// A Python wrapper around [SzurubooruClient]
mod szurubooru_client { mod szurubooru_client {
use pyo3::prelude::*; use pyo3::prelude::*;
#[pymodule_export] #[pymodule_export]
pub use crate::{ pub use crate::{
models::{ models::{
AroundPostResult, CommentResource, CreateUpdateComment, CreateUpdatePool, AroundPostResult, CommentResource, GlobalInfo, ImageSearchResult,
CreateUpdatePoolCategory, CreateUpdatePost, CreateUpdateTag, CreateUpdateTagCategory,
CreateUpdateUser, CreateUpdateUserAuthToken, GlobalInfo, ImageSearchResult,
ImageSearchSimilarPost, MergePool, MergePost, MergeTags, MicroPoolResource, ImageSearchSimilarPost, MergePool, MergePost, MergeTags, MicroPoolResource,
MicroPostResource, MicroTagResource, MicroUserResource, NoteResource, MicroPostResource, MicroTagResource, MicroUserResource, NoteResource,
PoolCategoryResource, PoolResource, PostResource, PostSafety, PostType, PoolCategoryResource, PoolResource, PostResource, PostSafety, PostType,

9
szurubooru-client/src/models.rs
View file

@ -186,7 +186,6 @@ impl TagResource {
/// ``` /// ```
#[derive(Debug, Clone, Serialize, Deserialize, Builder, Default)] #[derive(Debug, Clone, Serialize, Deserialize, Builder, Default)]
//#[builder(pattern="owned")] //#[builder(pattern="owned")]
#[cfg_attr(all(feature = "python"), pyclass(get_all))]
#[builder(setter(strip_option), build_fn(error = "SzurubooruClientError"))] #[builder(setter(strip_option), build_fn(error = "SzurubooruClientError"))]
pub struct CreateUpdateTag { pub struct CreateUpdateTag {
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
@ -244,7 +243,7 @@ impl TagCategoryResource {
#[derive(Debug, Clone, Serialize, Deserialize, Default, Builder)] #[derive(Debug, Clone, Serialize, Deserialize, Default, Builder)]
#[builder(setter(strip_option), build_fn(error = "SzurubooruClientError"))] #[builder(setter(strip_option), build_fn(error = "SzurubooruClientError"))]
#[cfg_attr(all(feature = "python"), pyclass(get_all))]
/// Used for creating or updating a Tag Category /// Used for creating or updating a Tag Category
pub struct CreateUpdateTagCategory { pub struct CreateUpdateTagCategory {
/// Resource version. See [versioning](ResourceVersion) /// Resource version. See [versioning](ResourceVersion)
@ -499,7 +498,6 @@ impl WithBaseURL for PostResource {
} }
#[derive(Debug, Clone, Serialize, Deserialize, Builder)] #[derive(Debug, Clone, Serialize, Deserialize, Builder)]
#[cfg_attr(all(feature = "python"), pyclass(get_all))]
#[builder(setter(strip_option), build_fn(error = "SzurubooruClientError"))] #[builder(setter(strip_option), build_fn(error = "SzurubooruClientError"))]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
/// A `struct` used to create or update a post. For updating purposes /// A `struct` used to create or update a post. For updating purposes
@ -774,7 +772,6 @@ impl WithBaseURL for UserResource {
} }
#[derive(Debug, Clone, Serialize, Deserialize, Default, Builder)] #[derive(Debug, Clone, Serialize, Deserialize, Default, Builder)]
#[cfg_attr(all(feature = "python"), pyclass(get_all))]
#[builder(setter(strip_option), build_fn(error = "SzurubooruClientError"))] #[builder(setter(strip_option), build_fn(error = "SzurubooruClientError"))]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
/// `struct` used to create or update a user resource. The version field is only used when /// `struct` used to create or update a user resource. The version field is only used when
@ -878,7 +875,6 @@ impl WithBaseURL for UserAuthTokenResource {
} }
#[derive(Debug, Clone, Serialize, Deserialize, Builder, Default)] #[derive(Debug, Clone, Serialize, Deserialize, Builder, Default)]
#[cfg_attr(all(feature = "python"), pyclass(get_all))]
#[builder(setter(into, strip_option), build_fn(error = "SzurubooruClientError"))] #[builder(setter(into, strip_option), build_fn(error = "SzurubooruClientError"))]
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
/// `struct` to create or update a UserAuthToken. `version` is only required when updating an /// `struct` to create or update a UserAuthToken. `version` is only required when updating an
@ -999,7 +995,6 @@ impl PoolCategoryResource {
} }
#[derive(Debug, Clone, Serialize, Deserialize, Builder)] #[derive(Debug, Clone, Serialize, Deserialize, Builder)]
#[cfg_attr(all(feature = "python"), pyclass(get_all))]
#[builder(setter(strip_option), build_fn(error = "SzurubooruClientError"))] #[builder(setter(strip_option), build_fn(error = "SzurubooruClientError"))]
/// `struct` used for creating or updating a pool category. This type uses a Builder pattern like /// `struct` used for creating or updating a pool category. This type uses a Builder pattern like
/// so: /// so:
@ -1072,7 +1067,6 @@ impl WithBaseURL for PoolResource {
} }
#[derive(Debug, Clone, Serialize, Deserialize, Builder, Default)] #[derive(Debug, Clone, Serialize, Deserialize, Builder, Default)]
#[cfg_attr(all(feature = "python"), pyclass(get_all))]
#[builder(setter(strip_option), build_fn(error = "SzurubooruClientError"))] #[builder(setter(strip_option), build_fn(error = "SzurubooruClientError"))]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
/// This type is used when creating or updating a pool object. It uses the builder pattern like so: /// This type is used when creating or updating a pool object. It uses the builder pattern like so:
@ -1202,7 +1196,6 @@ impl CommentResource {
} }
#[derive(Debug, Clone, Serialize, Deserialize, Builder, Default)] #[derive(Debug, Clone, Serialize, Deserialize, Builder, Default)]
#[cfg_attr(all(feature = "python"), pyclass(get_all))]
#[builder(setter(strip_option), build_fn(error = "SzurubooruClientError"))] #[builder(setter(strip_option), build_fn(error = "SzurubooruClientError"))]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
/// This type is used when creating or updating a comment. This type uses the builder pattern like /// This type is used when creating or updating a comment. This type uses the builder pattern like