Skip to content

Commit dafa63c

Browse files
authored
Merge pull request #3 from BeastByteAI/v0.0.5
spec 0.0.2, py 0.0.5
2 parents bb23a5e + 34cfe6b commit dafa63c

8 files changed

Lines changed: 13 additions & 29 deletions

File tree

spec/schemas/combined.json

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.0.1",
2+
"version": "0.0.2",
33
"manifest": {
44
"$defs": {
55
"JSON": {
@@ -10,9 +10,6 @@
1010
},
1111
"content_type": {
1212
"const": "JSON",
13-
"enum": [
14-
"JSON"
15-
],
1613
"title": "Content Type",
1714
"type": "string"
1815
},
@@ -52,9 +49,6 @@
5249
},
5350
"content_type": {
5451
"const": "NDJSON",
55-
"enum": [
56-
"NDJSON"
57-
],
5852
"title": "Content Type",
5953
"type": "string"
6054
},
@@ -432,7 +426,7 @@
432426
"default": null,
433427
"title": "Os"
434428
},
435-
"acclerator": {
429+
"accelerator": {
436430
"anyOf": [
437431
{
438432
"items": {
@@ -445,7 +439,7 @@
445439
}
446440
],
447441
"default": null,
448-
"title": "Acclerator"
442+
"title": "Accelerator"
449443
}
450444
},
451445
"title": "PipCondition",
@@ -624,9 +618,6 @@
624618
},
625619
"op": {
626620
"const": "ONNX_v1",
627-
"enum": [
628-
"ONNX_v1"
629-
],
630621
"title": "Op",
631622
"type": "string"
632623
},

spec/schemas/src/generate.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import json
22
import subprocess
3-
from pydantic_models.op_istances import OpInstances
3+
from pydantic_models.op_instances import OpInstances
44
from pydantic_models.manifest import Manifest
55
from pydantic_models.variants.pipeline import PipelineVariant
66
from pydantic_models.variants.pyfunc import PyFuncVariant
77
from pydantic_models.ops.onnx import ONNX_v1
88
from pydantic_models.meta import MetaEntry
99
from pydantic_models.envs import Python3_CondaPip
1010

11-
SPEC_VERSION = "0.0.1"
11+
SPEC_VERSION = "0.0.2"
1212

1313
manifest_json_schema = Manifest.model_json_schema()
1414
ops_json_schema = OpInstances.model_json_schema()

spec/schemas/src/pydantic_models/envs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
class PipCondition(BaseModel):
55
platform: list[str] | None = None
66
os: list[str] | None = None
7-
acclerator: list[str] | None = None
7+
accelerator: list[str] | None = None
88

99

1010
class PipDependency(BaseModel):
File renamed without changes.

spec/schemas/src/pydantic_models/ops/onnx.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from pydantic import BaseModel
22
from typing import Literal
3-
from pydantic_models.op_istances import OpInstance
3+
from pydantic_models.op_instances import OpInstance
44
from pydantic_models.common import Empty
55

66

src/python/fnnx/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.0.4"
1+
__version__ = "0.0.5"

src/python/fnnx/spec.py

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
# This file is auto generated and must not be modified manually!
22
schema = {
3-
"version": "0.0.1",
3+
"version": "0.0.2",
44
"manifest": {
55
"$defs": {
66
"JSON": {
77
"properties": {
88
"name": {"title": "Name", "type": "string"},
99
"content_type": {
1010
"const": "JSON",
11-
"enum": ["JSON"],
1211
"title": "Content Type",
1312
"type": "string",
1413
},
@@ -31,7 +30,6 @@
3130
"name": {"title": "Name", "type": "string"},
3231
"content_type": {
3332
"const": "NDJSON",
34-
"enum": ["NDJSON"],
3533
"title": "Content Type",
3634
"type": "string",
3735
},
@@ -248,13 +246,13 @@
248246
"default": None,
249247
"title": "Os",
250248
},
251-
"acclerator": {
249+
"accelerator": {
252250
"anyOf": [
253251
{"items": {"type": "string"}, "type": "array"},
254252
{"type": "null"},
255253
],
256254
"default": None,
257-
"title": "Acclerator",
255+
"title": "Accelerator",
258256
},
259257
},
260258
"title": "PipCondition",
@@ -367,12 +365,7 @@
367365
},
368366
"properties": {
369367
"id": {"pattern": "^[a-zA-Z0-9_]+$", "title": "Id", "type": "string"},
370-
"op": {
371-
"const": "ONNX_v1",
372-
"enum": ["ONNX_v1"],
373-
"title": "Op",
374-
"type": "string",
375-
},
368+
"op": {"const": "ONNX_v1", "title": "Op", "type": "string"},
376369
"inputs": {
377370
"items": {"$ref": "#/$defs/OpIO"},
378371
"title": "Inputs",

src/python/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "fnnx"
3-
version = "0.0.4"
3+
version = "0.0.5"
44
description = "A flexible ML packaging standard."
55
authors = [
66
{ name = "Oleh Kostromin", email = "oleh@beastbyte.ai" }

0 commit comments

Comments
 (0)