🌐 AI搜索 & 代理 主页
Skip to content

separate pipeline creation and usage for transform #921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kczimm merged 2 commits into from
Aug 22, 2023
Merged

separate pipeline creation and usage for transform #921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c45df4c
separate pipeline creation and usage for transform
kczimm Aug 15, 2023
8462f7c
remove unwrap from TracebackError trait
kczimm Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pgml-dashboard/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions pgml-extension/src/bindings/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,18 @@ pub trait Bindings: Send + Sync + Debug {
Self: Sized;
}

trait TracebackError<T> {
pub trait TracebackError<T> {
fn format_traceback(self, py: Python<'_>) -> Result<T>;
}

impl<T> TracebackError<T> for PyResult<T> {
fn format_traceback(self, py: Python<'_>) -> Result<T> {
self.map_err(|e| {
let traceback = e.traceback(py).unwrap().format().unwrap();
anyhow!("{traceback} {e}")
self.map_err(|e| match e.traceback(py) {
Some(traceback) => match traceback.format() {
Ok(traceback) => anyhow!("{traceback} {e}"),
Err(format_e) => anyhow!("{e} {format_e}"),
},
None => anyhow!("{e}"),
})
}
}
Expand Down
47 changes: 32 additions & 15 deletions pgml-extension/src/bindings/transformers/transformers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,28 +184,45 @@ def get_model_from(task):
return model[ty][0]


def create_pipeline(task):
if isinstance(task, str):
task = orjson.loads(task)
ensure_device(task)
convert_dtype(task)
model_name = task.get("model", None)
if model_name and "-ggml" in model_name:
pipe = GGMLPipeline(model_name, **task)
elif model_name and "-gptq" in model_name:
pipe = GPTQPipeline(model_name, **task)
else:
try:
pipe = StandardPipeline(model_name, **task)
except TypeError:
# some models fail when given "device" kwargs, remove and try again
task.pop("device")
pipe = StandardPipeline(model_name, **task)
return pipe


def transform_using(pipeline, args, inputs):
args = orjson.loads(args)
inputs = orjson.loads(inputs)

if pipeline.task == "question-answering":
inputs = [orjson.loads(input) for input in inputs]
convert_eos_token(pipeline.tokenizer, args)

return orjson.dumps(pipeline(inputs, **args), default=orjson_default).decode()


def transform(task, args, inputs):
task = orjson.loads(task)
args = orjson.loads(args)
inputs = orjson.loads(inputs)

key = ",".join([f"{key}:{val}" for (key, val) in sorted(task.items())])
if key not in __cache_transform_pipeline_by_task:
ensure_device(task)
convert_dtype(task)
model_name = task.get("model", None)
if model_name and "-ggml" in model_name:
pipe = GGMLPipeline(model_name, **task)
elif model_name and "-gptq" in model_name:
pipe = GPTQPipeline(model_name, **task)
else:
try:
pipe = StandardPipeline(model_name, **task)
except TypeError:
# some models fail when given "device" kwargs, remove and try again
task.pop("device")
pipe = StandardPipeline(model_name, **task)

pipe = create_pipeline(task)
__cache_transform_pipeline_by_task[key] = pipe

pipe = __cache_transform_pipeline_by_task[key]
Expand Down