daniel543x/artcraft
1
0 Fork 0
mirror of https://github.com/storytold/artcraft.git synced 2026-11-05 09:48:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

weights_queries list weights by user more testing and implementation needed

Browse Source
This commit is contained in:
Michael Chung committed 2023-11-24 23:50:50 -05:00
1 parent ddb35c5133
commit c9df278d40
2 files changed
+115 -68
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

crates/lib/mysql_queries/src/queries/model_weights/list_weights_by_user.rs
+114 -67
View File
@@ -1,35 +1,11 @@
use std::os::linux::raw;
use anyhow::anyhow;
use chrono::{ DateTime, Utc };
use log::{ info, warn };
use sqlx::{ MySql, MySqlPool, query };
use sqlx::pool::PoolConnection;
// let result = sqlx
// ::query_as!(
// RawWeightJoinUser,
// r#"
// SELECT
// mw.token as `token: tokens::tokens::model_weights::ModelWeightsToken`,
// mw.title,
// users.token as `creator_user_token: tokens::tokens::users::UserToken`,
// users.username as creator_username,
// users.display_name as creator_display_name,
// users.email_gravatar_hash as creator_email_gravatar_hash,
// mw.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,
// mw.created_at,
// mw.updated_at
// FROM model_weights as mw
// JOIN users
// ON users.token = mw.creator_user_token
// WHERE
// users.username = ?
// AND mw.user_deleted_at IS NULL
// AND mw.mod_deleted_at IS NULL
// "#,
// creator_username
// )
// .fetch_all(mysql_connection).await?
use enums::common::visibility::Visibility;
use errors::AnyhowResult;
use tokens::tokens::model_weights::ModelWeightToken;
@@ -88,6 +64,118 @@ pub async fn list_weights_by_username(
list_weights_by_username_with_connection(&mut connection, username, can_see_deleted).await
}
pub async fn get_raw_weights_by_username(
mysql_pool: &MySqlPool,
username: &str,
can_see_deleted: bool
) -> AnyhowResult<Vec<RawWeightJoinUser>> {
let mut connection = mysql_pool.acquire().await?;
if can_see_deleted {
let raw_weights: Vec<RawWeightJoinUser> = sqlx::query_as!(
RawWeightJoinUser,
r#"
SELECT
mw.token as `token: tokens::tokens::model_weights::ModelWeightToken`,
mw.title,
mw.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,
mw.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,
mw.maybe_thumbnail_token,
mw.description_markdown,
mw.description_rendered_html,
users.token as `creator_user_token: tokens::tokens::users::UserToken`,
users.username as username,
users.display_name as display_name,
users.email_gravatar_hash as email_gravatar_hash,
mw.creator_ip_address,
mw.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,
mw.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,
mw.original_download_url,
mw.original_filename,
mw.file_size_bytes,
mw.file_checksum_sha2,
mw.private_bucket_hash,
mw.maybe_private_bucket_prefix,
mw.maybe_private_bucket_extension,
mw.cached_user_ratings_negative_count,
mw.cached_user_ratings_positive_count,
mw.cached_user_ratings_total_count,
mw.maybe_cached_user_ratings_ratio,
mw.cached_user_ratings_last_updated_at,
mw.version,
mw.created_at,
mw.updated_at,
mw.user_deleted_at,
mw.mod_deleted_at
FROM model_weights as mw
JOIN users
ON users.token = mw.creator_user_token
WHERE
users.username = ?
"#,
username).fetch_all(&mut connection)
.await?;
return Ok(raw_weights);
} else {
let raw_weights: Vec<RawWeightJoinUser> = sqlx::query_as!(
RawWeightJoinUser,
r#"
SELECT
mw.token as `token: tokens::tokens::model_weights::ModelWeightToken`,
mw.title,
mw.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,
mw.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,
mw.maybe_thumbnail_token,
mw.description_markdown,
mw.description_rendered_html,
users.token as `creator_user_token: tokens::tokens::users::UserToken`,
users.username as username,
users.display_name as display_name,
users.email_gravatar_hash as email_gravatar_hash,
mw.creator_ip_address,
mw.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,
mw.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,
mw.original_download_url,
mw.original_filename,
mw.file_size_bytes,
mw.file_checksum_sha2,
mw.private_bucket_hash,
mw.maybe_private_bucket_prefix,
mw.maybe_private_bucket_extension,
mw.cached_user_ratings_negative_count,
mw.cached_user_ratings_positive_count,
mw.cached_user_ratings_total_count,
mw.maybe_cached_user_ratings_ratio,
mw.cached_user_ratings_last_updated_at,
mw.version,
mw.created_at,
mw.updated_at,
mw.user_deleted_at,
mw.mod_deleted_at
FROM model_weights as mw
JOIN users
ON users.token = mw.creator_user_token
WHERE
users.username = ?
AND mw.user_deleted_at IS NULL
AND mw.mod_deleted_at IS NULL
"#,
username).fetch_all(&mut connection).await?;
Ok(raw_weights)
}
}
pub async fn map_to_weights() {
}
pub async fn filter_weights() {
}
pub async fn list_weights_by_username_with_connection(
mysql_connection: &mut PoolConnection<MySql>,
creator_username: &str,
@@ -176,47 +264,6 @@ async fn list_datasets_by_creator_username(
}
// CREATE TABLE model_weights (
// id BIGINT(20) NOT NULL AUTO_INCREMENT,
// token VARCHAR(32) NOT NULL,
// weights_type VARCHAR(32) NOT NULL,
// weights_category VARCHAR(32) NOT NULL,
// title VARCHAR(255) NOT NULL,
// maybe_thumbnail_token VARCHAR(32) DEFAULT NULL,
// description_markdown TEXT NOT NULL,
// description_rendered_html TEXT NOT NULL,
// creator_user_token VARCHAR(32) NOT NULL,
// creator_ip_address VARCHAR(40) NOT NULL,
// creator_set_visibility ENUM(
// 'public',
// 'hidden',
// 'private'
// ) NOT NULL DEFAULT 'public',
// maybe_last_update_user_token VARCHAR(32) DEFAULT NULL,
// original_download_url VARCHAR(512) DEFAULT NULL,
// original_filename VARCHAR(255) DEFAULT NULL,
// file_size_bytes INT(10) NOT NULL DEFAULT 0,
// file_checksum_sha2 CHAR(64) NOT NULL,
// private_bucket_hash VARCHAR(32) NOT NULL,
// maybe_private_bucket_prefix VARCHAR(16) DEFAULT NULL,
// maybe_private_bucket_extension VARCHAR(16) DEFAULT NULL,
// cached_user_ratings_total_count INT(10) UNSIGNED NOT NULL DEFAULT 0,
// cached_user_ratings_positive_count INT(10) UNSIGNED NOT NULL DEFAULT 0,
// cached_user_ratings_negative_count INT(10) UNSIGNED NOT NULL DEFAULT 0,
// maybe_cached_user_ratings_ratio FLOAT,
// cached_user_ratings_last_updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
// version INT NOT NULL DEFAULT 0,
// created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
// updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
// user_deleted_at TIMESTAMP NULL,
// mod_deleted_at TIMESTAMP NULL,
// PRIMARY KEY (id),
// UNIQUE KEY (token)
// ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
#[derive(Serialize)]
pub struct RawWeightJoinUser {
pub token: ModelWeightToken,
crates/lib/mysql_queries/src/queries/model_weights/mod.rs
+1 -1
View File
@@ -4,4 +4,4 @@ pub mod get_weight;
pub mod update_weight;
pub mod list_weights_by_user;
// pub mod list_weights_query_builder;
pub mod tests;
pub mod tests;