Skip to content

Commit 28571f7

Browse files
authored
fix: format and examples (#446)
* fix compilation * add github workflow for compilation and fmt checks * cargo fmt * remove unused stuff * fix compilation
1 parent 85a9d68 commit 28571f7

File tree

10 files changed

+66
-16
lines changed

10 files changed

+66
-16
lines changed

.github/workflows/pr-checks.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: PR Checks
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened]
6+
pull_request_target:
7+
types: [opened, synchronize, reopened]
8+
9+
jobs:
10+
build:
11+
name: Build Workspace
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Checkout code
16+
uses: actions/checkout@v4
17+
18+
- name: Install Rust
19+
uses: actions-rs/toolchain@v1
20+
with:
21+
toolchain: stable
22+
components: rustfmt, clippy
23+
override: true
24+
25+
- name: Cache cargo registry
26+
uses: actions/cache@v3
27+
with:
28+
path: |
29+
~/.cargo/registry
30+
~/.cargo/git
31+
target
32+
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
33+
restore-keys: |
34+
${{ runner.os }}-cargo-
35+
36+
- name: Build workspace
37+
run: cargo build --workspace --verbose
38+
39+
- name: Check formatting
40+
run: cargo fmt --all -- --check
41+
42+
# - name: Run clippy
43+
# run: cargo clippy --workspace -- -D warnings

async-openai/src/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ async fn map_stream_error(value: EventSourceError) -> OpenAIError {
487487
"Unreachable because read_response returns err when status_code {status_code} is invalid"
488488
))
489489
}
490-
_ => OpenAIError::StreamError(StreamError::ReqwestEventSource(value.into())),
490+
_ => OpenAIError::StreamError(StreamError::ReqwestEventSource(value)),
491491
}
492492
}
493493

async-openai/src/error.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
//! Errors originating from API calls, parsing responses, and reading-or-writing to the file system.
2-
use std::string::FromUtf8Error;
32
4-
use reqwest::{header::HeaderValue, Response};
53
use serde::{Deserialize, Serialize};
64

75
#[derive(Debug, thiserror::Error)]
@@ -82,10 +80,7 @@ pub struct WrappedError {
8280

8381
pub(crate) fn map_deserialization_error(e: serde_json::Error, bytes: &[u8]) -> OpenAIError {
8482
let json_content = String::from_utf8_lossy(bytes);
85-
tracing::error!(
86-
"failed deserialization of: {}",
87-
json_content
88-
);
83+
tracing::error!("failed deserialization of: {}", json_content);
8984

9085
OpenAIError::JSONDeserialize(e, json_content.to_string())
9186
}

async-openai/src/file.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ impl<'c, C: Config> Files<'c, C> {
7070
#[cfg(test)]
7171
mod tests {
7272
use crate::{
73-
types::{CreateFileRequestArgs, FilePurpose, FileExpiresAfter, FileExpiresAfterAnchor},
73+
types::{CreateFileRequestArgs, FileExpiresAfter, FileExpiresAfterAnchor, FilePurpose},
7474
Client,
7575
};
7676

@@ -89,7 +89,10 @@ mod tests {
8989
let request = CreateFileRequestArgs::default()
9090
.file(test_file_path)
9191
.purpose(FilePurpose::FineTune)
92-
.expires_after(FileExpiresAfter{ anchor: FileExpiresAfterAnchor::CreatedAt, seconds: 3600 })
92+
.expires_after(FileExpiresAfter {
93+
anchor: FileExpiresAfterAnchor::CreatedAt,
94+
seconds: 3600,
95+
})
9396
.build()
9497
.unwrap();
9598

async-openai/src/types/file.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pub enum FilePurpose {
2323
pub enum FileExpiresAfterAnchor {
2424
#[default]
2525
#[serde(rename = "created_at")]
26-
CreatedAt
26+
CreatedAt,
2727
}
2828

2929
#[derive(Debug, Default, Clone, PartialEq)]

async-openai/src/types/impls.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ use super::{
2727
ChatCompletionRequestUserMessageContentPart, ChatCompletionToolChoiceOption, CreateFileRequest,
2828
CreateImageEditRequest, CreateImageVariationRequest, CreateMessageRequestContent,
2929
CreateSpeechResponse, CreateTranscriptionRequest, CreateTranslationRequest, DallE2ImageSize,
30-
EmbeddingInput, FileInput, FilePurpose, FunctionName, Image, ImageInput, ImageModel,
31-
ImageResponseFormat, ImageSize, ImageUrl, ImagesResponse, ModerationInput, Prompt, Role, Stop,
32-
TimestampGranularity, FileExpiresAfterAnchor
30+
EmbeddingInput, FileExpiresAfterAnchor, FileInput, FilePurpose, FunctionName, Image,
31+
ImageInput, ImageModel, ImageResponseFormat, ImageSize, ImageUrl, ImagesResponse,
32+
ModerationInput, Prompt, Role, Stop, TimestampGranularity,
3333
};
3434

3535
/// for `impl_from!(T, Enum)`, implements
@@ -985,9 +985,10 @@ impl AsyncTryFrom<CreateFileRequest> for reqwest::multipart::Form {
985985
let mut form = reqwest::multipart::Form::new()
986986
.part("file", file_part)
987987
.text("purpose", request.purpose.to_string());
988-
988+
989989
if let Some(expires_after) = request.expires_after {
990-
form = form.text("expires_after[anchor]", expires_after.anchor.to_string())
990+
form = form
991+
.text("expires_after[anchor]", expires_after.anchor.to_string())
991992
.text("expires_after[seconds]", expires_after.seconds.to_string());
992993
}
993994
Ok(form)

examples/assistants-code-interpreter/src/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
2828
.create(CreateFileRequest {
2929
file: "./input/CASTHPI.csv".into(),
3030
purpose: FilePurpose::Assistants,
31+
expires_after: None,
3132
})
3233
.await?;
3334

examples/assistants-file-search/src/main.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
3838
.create(CreateFileRequest {
3939
file: "./input/uber-10k.pdf".into(),
4040
purpose: FilePurpose::Assistants,
41+
expires_after: None,
4142
})
4243
.await?;
4344

@@ -84,6 +85,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
8485
.create(CreateFileRequest {
8586
file: "./input/lyft-10k.pdf".into(),
8687
purpose: FilePurpose::Assistants,
88+
expires_after: None,
8789
})
8890
.await?;
8991

examples/responses/src/main.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ use std::error::Error;
22

33
use async_openai::{
44
types::responses::{
5-
AllowedTools, CreateResponseArgs, Input, InputItem, InputMessageArgs, McpArgs, RequireApproval, RequireApprovalPolicy, Role, TextConfig, ToolDefinition::{Mcp, WebSearchPreview}, Verbosity, WebSearchPreviewArgs
5+
AllowedTools, CreateResponseArgs, Input, InputItem, InputMessageArgs, McpArgs,
6+
RequireApproval, RequireApprovalPolicy, Role, TextConfig,
7+
ToolDefinition::{Mcp, WebSearchPreview},
8+
Verbosity, WebSearchPreviewArgs,
69
},
710
Client,
811
};

examples/vector-store-retrieval/src/main.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
2121
.create(CreateFileRequest {
2222
file: "./input/uber-10k.pdf".into(),
2323
purpose: FilePurpose::Assistants,
24+
expires_after: None,
2425
})
2526
.await?;
2627

@@ -29,6 +30,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
2930
.create(CreateFileRequest {
3031
file: "./input/lyft-10k.pdf".into(),
3132
purpose: FilePurpose::Assistants,
33+
expires_after: None,
3234
})
3335
.await?;
3436

0 commit comments

Comments
 (0)