Skip to content

Commit 1a35632

Browse files
yujongleeyujonglee
committed
more fixes
1 parent e2bb7ec commit 1a35632

File tree

4 files changed

+18
-131
lines changed

4 files changed

+18
-131
lines changed

‎crates/am/src/client.rs‎

Lines changed: 4 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
use crate::{
2-
ComputeUnits, Error, ErrorResponse, GenericResponse, InitRequest, InitResponse, ServerStatus,
3-
};
1+
use crate::{Error, ErrorResponse, GenericResponse, InitRequest, InitResponse, ServerStatus};
42
use reqwest::{Response, StatusCode};
53

64
#[derive(Clone)]
@@ -35,33 +33,6 @@ impl Client {
3533
}
3634
}
3735

38-
pub async fn wait_for_ready(
39-
&self,
40-
max_wait_time: Option<u32>,
41-
poll_interval: Option<f32>,
42-
) -> Result<ServerStatus, Error> {
43-
let url = format!("{}/v1/waitForReady", self.base_url);
44-
let mut request = self.client.get(&url);
45-
46-
if let Some(max_wait) = max_wait_time {
47-
request = request.query(&[("maxWaitTime", max_wait)]);
48-
}
49-
50-
if let Some(interval) = poll_interval {
51-
request = request.query(&[("pollInterval", interval)]);
52-
}
53-
54-
let response = request.send().await?;
55-
56-
match response.status() {
57-
StatusCode::OK => Ok(response.json().await?),
58-
StatusCode::BAD_REQUEST | StatusCode::REQUEST_TIMEOUT => {
59-
Err(self.handle_error_response(response).await)
60-
}
61-
_ => Err(Error::UnexpectedResponse),
62-
}
63-
}
64-
6536
pub async fn init(&self, request: InitRequest) -> Result<InitResponse, Error> {
6637
if !request.api_key.starts_with("ax_") {
6738
return Err(Error::InvalidApiKey);
@@ -129,77 +100,15 @@ impl InitRequest {
129100
Self {
130101
api_key: api_key.into(),
131102
model: None,
132-
model_token: None,
133103
download_base: None,
134104
model_repo: None,
135105
model_folder: None,
136-
tokenizer_folder: None,
137-
fast_load: None,
138-
fast_load_encoder_compute_units: None,
139-
fast_load_decoder_compute_units: None,
140-
model_vad: None,
141-
verbose: None,
142106
}
143107
}
144108

145-
pub fn with_model(mut self, model: impl Into<String>) -> Self {
146-
self.model = Some(model.into());
147-
self
148-
}
149-
150-
pub fn with_model_token(mut self, token: impl Into<String>) -> Self {
151-
self.model_token = Some(token.into());
152-
self
153-
}
154-
155-
pub fn with_download_base(mut self, download_base: impl Into<String>) -> Self {
156-
self.download_base = Some(download_base.into());
157-
self
158-
}
159-
160-
pub fn with_model_repo(mut self, repo: impl Into<String>) -> Self {
161-
self.model_repo = Some(repo.into());
109+
pub fn with_model(mut self, model: crate::AmModel) -> Self {
110+
self.model = Some(model.model_key().to_string());
111+
self.model_repo = Some(model.repo_name().to_string());
162112
self
163113
}
164-
165-
pub fn with_model_folder(mut self, folder: impl Into<String>) -> Self {
166-
self.model_folder = Some(folder.into());
167-
self
168-
}
169-
170-
pub fn with_tokenizer_folder(mut self, folder: impl Into<String>) -> Self {
171-
self.tokenizer_folder = Some(folder.into());
172-
self
173-
}
174-
175-
pub fn with_fast_load(mut self, fast_load: bool) -> Self {
176-
self.fast_load = Some(fast_load);
177-
self
178-
}
179-
180-
pub fn with_encoder_compute_units(mut self, units: ComputeUnits) -> Self {
181-
self.fast_load_encoder_compute_units = Some(units);
182-
self
183-
}
184-
185-
pub fn with_decoder_compute_units(mut self, units: ComputeUnits) -> Self {
186-
self.fast_load_decoder_compute_units = Some(units);
187-
self
188-
}
189-
190-
pub fn with_model_vad(mut self, vad: bool) -> Self {
191-
self.model_vad = Some(vad);
192-
self
193-
}
194-
195-
pub fn with_verbose(mut self, verbose: bool) -> Self {
196-
self.verbose = Some(verbose);
197-
self
198-
}
199-
}
200-
201-
impl Default for Client {
202-
fn default() -> Self {
203-
Self::new("http://localhost:50060")
204-
}
205114
}

‎crates/am/src/types.rs‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -28,36 +28,11 @@ pub struct InitRequest {
2828
#[serde(skip_serializing_if = "Option::is_none")]
2929
pub model: Option<String>,
3030
#[serde(skip_serializing_if = "Option::is_none")]
31-
pub model_token: Option<String>,
32-
#[serde(skip_serializing_if = "Option::is_none")]
3331
pub download_base: Option<String>,
3432
#[serde(skip_serializing_if = "Option::is_none")]
3533
pub model_repo: Option<String>,
3634
#[serde(skip_serializing_if = "Option::is_none")]
3735
pub model_folder: Option<String>,
38-
#[serde(skip_serializing_if = "Option::is_none")]
39-
pub tokenizer_folder: Option<String>,
40-
#[serde(skip_serializing_if = "Option::is_none")]
41-
pub fast_load: Option<bool>,
42-
#[serde(skip_serializing_if = "Option::is_none")]
43-
pub fast_load_encoder_compute_units: Option<ComputeUnits>,
44-
#[serde(skip_serializing_if = "Option::is_none")]
45-
pub fast_load_decoder_compute_units: Option<ComputeUnits>,
46-
#[serde(skip_serializing_if = "Option::is_none")]
47-
pub model_vad: Option<bool>,
48-
#[serde(skip_serializing_if = "Option::is_none")]
49-
pub verbose: Option<bool>,
50-
}
51-
52-
#[derive(Debug, Clone, Serialize, Deserialize)]
53-
#[serde(rename_all = "lowercase")]
54-
pub enum ComputeUnits {
55-
Cpu,
56-
#[serde(rename = "cpuandgpu")]
57-
CpuAndGpu,
58-
#[serde(rename = "cpuandneuralengine")]
59-
CpuAndNeuralEngine,
60-
All,
6136
}
6237

6338
#[derive(Debug, Clone, Serialize, Deserialize)]

‎plugins/local-stt/src/server/external.rs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,11 @@ impl ServerHandle {
1414
}
1515

1616
pub async fn init(&self) -> Result<(), crate::Error> {
17-
self.client
18-
.init(hypr_am::InitRequest::new("ax_123"))
19-
.await?;
20-
2117
let _init_result = self
2218
.client
2319
.init(
2420
hypr_am::InitRequest::new(self.api_key.clone())
25-
.with_model(hypr_am::AmModel::WhisperSmallEn.model_key())
26-
.with_model_repo(hypr_am::AmModel::WhisperSmallEn.repo_name()),
21+
.with_model(hypr_am::AmModel::WhisperSmallEn),
2722
)
2823
.await?;
2924

‎plugins/windows/src/ext.rs‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,19 @@ impl HyprWindow {
310310
.inner_size(900.0, 650.0)
311311
.min_inner_size(800.0, 600.0)
312312
.build()?,
313-
Self::Settings => self
314-
.window_builder(app, "/app/settings")
315-
.resizable(true)
316-
.inner_size(800.0, 600.0)
317-
.build()?,
313+
Self::Settings => {
314+
let window = self
315+
.window_builder(app, "/app/settings")
316+
.resizable(true)
317+
.min_inner_size(800.0, 600.0)
318+
.build()?;
319+
320+
let desired_size = LogicalSize::new(800.0, 600.0);
321+
window.set_size(LogicalSize::new(1.0, 1.0))?;
322+
std::thread::sleep(std::time::Duration::from_millis(10));
323+
window.set_size(desired_size)?;
324+
window
325+
}
318326
Self::Video(id) => self
319327
.window_builder(app, &format!("/video?id={}", id))
320328
.maximizable(false)

0 commit comments

Comments
 (0)