diff --git a/python/stencila/schema/types.py b/python/stencila/schema/types.py index 8090ebc6f1..f4250e0085 100644 --- a/python/stencila/schema/types.py +++ b/python/stencila/schema/types.py @@ -7,6 +7,13 @@ from typing import Any, Dict, List as Array, Optional, Union from enum import Enum +Null = None +Boolean = bool +Number = float +Integer = int +String = str +Object = Dict[str, Any] + ECitationMode = Enum("CitationMode", ["Parenthetical", "Narrative", "NarrativeAuthor", "NarrativeYear", "normal", "suppressAuthor"]) EClaimType = Enum("ClaimType", ["Statement", "Theorem", "Lemma", "Proof", "Postulate", "Hypothesis", "Proposition", "Corollary"]) @@ -27,17 +34,17 @@ class Entity: The most simple compound (ie. non-atomic like `number`, `string` etc) type. """ - id: Optional[str] = None + id: Optional[String] = None """The identifier for this item.""" - meta: Optional[Dict[str, Any]] = None + meta: Optional[Object] = None """Metadata associated with this item.""" def __init__( self, - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + id: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( @@ -51,7 +58,7 @@ def __init__( class Cite(Entity): """A reference to a CreativeWork that is cited in another CreativeWork.""" - target: str + target: String """The target of the citation (URL or reference ID).""" citationIntent: Optional[Array["CitationIntentEnumeration"]] = None @@ -60,22 +67,22 @@ class Cite(Entity): citationMode: Optional["ECitationMode"] = None """Determines how the citation is shown within the surrounding text.""" - citationPrefix: Optional[str] = None + citationPrefix: Optional[String] = None """Text to show before the citation.""" - citationSuffix: Optional[str] = None + citationSuffix: Optional[String] = None """Text to show after the citation.""" content: Optional[Array["InlineContent"]] = None """Optional structured content/text of this citation.""" - pageEnd: Optional[Union[int, str]] = None + pageEnd: Optional[Union[Integer, String]] = None """The page on which the work ends; for example "138" or "xvi".""" - pageStart: Optional[Union[int, str]] = None + pageStart: Optional[Union[Integer, String]] = None """The page on which the work starts; for example "135" or "xiii".""" - pagination: Optional[str] = None + pagination: Optional[String] = None """Any description of pages that is not separated into pageStart and pageEnd; for example, "1-6, 9, 55". """ @@ -83,17 +90,17 @@ class Cite(Entity): def __init__( self, - target: str, + target: String, citationIntent: Optional[Array["CitationIntentEnumeration"]] = None, citationMode: Optional["ECitationMode"] = None, - citationPrefix: Optional[str] = None, - citationSuffix: Optional[str] = None, + citationPrefix: Optional[String] = None, + citationSuffix: Optional[String] = None, content: Optional[Array["InlineContent"]] = None, - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, - pageEnd: Optional[Union[int, str]] = None, - pageStart: Optional[Union[int, str]] = None, - pagination: Optional[str] = None + id: Optional[String] = None, + meta: Optional[Object] = None, + pageEnd: Optional[Union[Integer, String]] = None, + pageStart: Optional[Union[Integer, String]] = None, + pagination: Optional[String] = None ) -> None: super().__init__( id=id, @@ -129,8 +136,8 @@ class CiteGroup(Entity): def __init__( self, items: Array["Cite"], - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + id: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( id=id, @@ -143,23 +150,23 @@ def __init__( class Code(Entity): """Base type for code nodes e.g. CodeBlock, CodeExpression.""" - text: str + text: String """The text of the code.""" - mediaType: Optional[str] = None + mediaType: Optional[String] = None """Media type, typically expressed using a MIME format, of the code.""" - programmingLanguage: Optional[str] = None + programmingLanguage: Optional[String] = None """The programming language of the code.""" def __init__( self, - text: str, - id: Optional[str] = None, - mediaType: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, - programmingLanguage: Optional[str] = None + text: String, + id: Optional[String] = None, + mediaType: Optional[String] = None, + meta: Optional[Object] = None, + programmingLanguage: Optional[String] = None ) -> None: super().__init__( id=id, @@ -176,12 +183,12 @@ def __init__( class CodeBlock(Code): """A code block.""" - exportFrom: Optional[str] = None + exportFrom: Optional[String] = None """A compilation directive giving the name of the variable to export into the content of the code block. """ - importTo: Optional[str] = None + importTo: Optional[String] = None """A compilation directive giving the name of the variable to import the content of the code block as. """ @@ -189,13 +196,13 @@ class CodeBlock(Code): def __init__( self, - text: str, - exportFrom: Optional[str] = None, - id: Optional[str] = None, - importTo: Optional[str] = None, - mediaType: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, - programmingLanguage: Optional[str] = None + text: String, + exportFrom: Optional[String] = None, + id: Optional[String] = None, + importTo: Optional[String] = None, + mediaType: Optional[String] = None, + meta: Optional[Object] = None, + programmingLanguage: Optional[String] = None ) -> None: super().__init__( text=text, @@ -213,60 +220,60 @@ def __init__( class CodeChunk(CodeBlock): """A executable chunk of code.""" - alters: Optional[Array[str]] = None + alters: Optional[Array[String]] = None """Names of variables that the code chunk alters.""" - assigns: Optional[Array[Union["Variable", str]]] = None + assigns: Optional[Array[Union["Variable", String]]] = None """Variables that the code chunk assigns to.""" - caption: Optional[Union[Array["BlockContent"], str]] = None + caption: Optional[Union[Array["BlockContent"], String]] = None """A caption for the CodeChunk.""" - declares: Optional[Array[Union["Variable", "Function", str]]] = None + declares: Optional[Array[Union["Variable", "Function", String]]] = None """Variables that the code chunk declares.""" - duration: Optional[float] = None + duration: Optional[Number] = None """Duration in seconds of the last execution of the chunk.""" errors: Optional[Array["CodeError"]] = None """Errors when compiling or executing the chunk.""" - imports: Optional[Array[Union["SoftwareSourceCode", "SoftwareApplication", str]]] = None + imports: Optional[Array[Union["SoftwareSourceCode", "SoftwareApplication", String]]] = None """Software packages that the code chunk imports""" - label: Optional[str] = None + label: Optional[String] = None """A short label for the CodeChunk.""" - outputs: Optional[Array["Any"]] = None + outputs: Optional[Array[Any]] = None """Outputs from executing the chunk.""" - reads: Optional[Array[str]] = None + reads: Optional[Array[String]] = None """Filesystem paths that this code chunk reads from.""" - uses: Optional[Array[Union["Variable", str]]] = None + uses: Optional[Array[Union["Variable", String]]] = None """Names of variables that the code chunk uses (but does not alter).""" def __init__( self, - text: str, - alters: Optional[Array[str]] = None, - assigns: Optional[Array[Union["Variable", str]]] = None, - caption: Optional[Union[Array["BlockContent"], str]] = None, - declares: Optional[Array[Union["Variable", "Function", str]]] = None, - duration: Optional[float] = None, + text: String, + alters: Optional[Array[String]] = None, + assigns: Optional[Array[Union["Variable", String]]] = None, + caption: Optional[Union[Array["BlockContent"], String]] = None, + declares: Optional[Array[Union["Variable", "Function", String]]] = None, + duration: Optional[Number] = None, errors: Optional[Array["CodeError"]] = None, - exportFrom: Optional[str] = None, - id: Optional[str] = None, - importTo: Optional[str] = None, - imports: Optional[Array[Union["SoftwareSourceCode", "SoftwareApplication", str]]] = None, - label: Optional[str] = None, - mediaType: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, - outputs: Optional[Array["Any"]] = None, - programmingLanguage: Optional[str] = None, - reads: Optional[Array[str]] = None, - uses: Optional[Array[Union["Variable", str]]] = None + exportFrom: Optional[String] = None, + id: Optional[String] = None, + importTo: Optional[String] = None, + imports: Optional[Array[Union["SoftwareSourceCode", "SoftwareApplication", String]]] = None, + label: Optional[String] = None, + mediaType: Optional[String] = None, + meta: Optional[Object] = None, + outputs: Optional[Array[Any]] = None, + programmingLanguage: Optional[String] = None, + reads: Optional[Array[String]] = None, + uses: Optional[Array[Union["Variable", String]]] = None ) -> None: super().__init__( text=text, @@ -306,11 +313,11 @@ class CodeFragment(Code): def __init__( self, - text: str, - id: Optional[str] = None, - mediaType: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, - programmingLanguage: Optional[str] = None + text: String, + id: Optional[String] = None, + mediaType: Optional[String] = None, + meta: Optional[Object] = None, + programmingLanguage: Optional[String] = None ) -> None: super().__init__( text=text, @@ -328,19 +335,19 @@ class CodeExpression(CodeFragment): errors: Optional[Array["CodeError"]] = None """Errors when compiling or executing the chunk.""" - output: Optional["Any"] = None + output: Optional[Any] = None """The value of the expression when it was last evaluated.""" def __init__( self, - text: str, + text: String, errors: Optional[Array["CodeError"]] = None, - id: Optional[str] = None, - mediaType: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, - output: Optional["Any"] = None, - programmingLanguage: Optional[str] = None + id: Optional[String] = None, + mediaType: Optional[String] = None, + meta: Optional[Object] = None, + output: Optional[Any] = None, + programmingLanguage: Optional[String] = None ) -> None: super().__init__( text=text, @@ -360,23 +367,23 @@ class CodeError(Entity): An error that occurred when parsing, compiling or executing a Code node. """ - errorMessage: str + errorMessage: String """The error message or brief description of the error.""" - errorType: Optional[str] = None + errorType: Optional[String] = None """The type of error e.g. "SyntaxError", "ZeroDivisionError".""" - stackTrace: Optional[str] = None + stackTrace: Optional[String] = None """Stack trace leading up to the error.""" def __init__( self, - errorMessage: str, - errorType: Optional[str] = None, - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, - stackTrace: Optional[str] = None + errorMessage: String, + errorType: Optional[String] = None, + id: Optional[String] = None, + meta: Optional[Object] = None, + stackTrace: Optional[String] = None ) -> None: super().__init__( id=id, @@ -393,15 +400,15 @@ def __init__( class Date(Entity): """A date encoded as a ISO 8601 string.""" - value: str + value: String """The date as an ISO 8601 string.""" def __init__( self, - value: str, - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + value: String, + id: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( id=id, @@ -424,8 +431,8 @@ class Mark(Entity): def __init__( self, content: Array["InlineContent"], - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + id: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( id=id, @@ -441,8 +448,8 @@ class Delete(Mark): def __init__( self, content: Array["InlineContent"], - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + id: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( content=content, @@ -458,8 +465,8 @@ class Emphasis(Mark): def __init__( self, content: Array["InlineContent"], - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + id: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( content=content, @@ -472,35 +479,35 @@ def __init__( class Thing(Entity): """The most generic type of item.""" - alternateNames: Optional[Array[str]] = None + alternateNames: Optional[Array[String]] = None """Alternate names (aliases) for the item.""" - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None """A description of the item.""" - identifiers: Optional[Array[Union["PropertyValue", str]]] = None + identifiers: Optional[Array[Union["PropertyValue", String]]] = None """Any kind of identifier for any kind of Thing.""" - images: Optional[Array[Union["ImageObject", str]]] = None + images: Optional[Array[Union["ImageObject", String]]] = None """Images of the item.""" - name: Optional[str] = None + name: Optional[String] = None """The name of the item.""" - url: Optional[str] = None + url: Optional[String] = None """The URL of the item.""" def __init__( self, - alternateNames: Optional[Array[str]] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, - url: Optional[str] = None + alternateNames: Optional[Array[String]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, + url: Optional[String] = None ) -> None: super().__init__( id=id, @@ -526,28 +533,28 @@ class Brand(Thing): group, or similar. """ - name: str # type: ignore + name: String # type: ignore """The name of the item.""" - logo: Optional[Union["ImageObject", str]] = None + logo: Optional[Union["ImageObject", String]] = None """A logo associated with the brand.""" - reviews: Optional[Array[str]] = None + reviews: Optional[Array[String]] = None """Reviews of the brand.""" def __init__( self, - name: str, - alternateNames: Optional[Array[str]] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, - logo: Optional[Union["ImageObject", str]] = None, - meta: Optional[Dict[str, Any]] = None, - reviews: Optional[Array[str]] = None, - url: Optional[str] = None + name: String, + alternateNames: Optional[Array[String]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, + logo: Optional[Union["ImageObject", String]] = None, + meta: Optional[Object] = None, + reviews: Optional[Array[String]] = None, + url: Optional[String] = None ) -> None: super().__init__( name=name, @@ -570,31 +577,31 @@ def __init__( class ContactPoint(Thing): """A contact point, usually within an organization.""" - availableLanguages: Optional[Array[str]] = None + availableLanguages: Optional[Array[String]] = None """Languages (human not programming) in which it is possible to communicate with the organization/department etc. """ - emails: Optional[Array[str]] = None + emails: Optional[Array[String]] = None """Email address for correspondence.""" - telephoneNumbers: Optional[Array[str]] = None + telephoneNumbers: Optional[Array[String]] = None """Telephone numbers for the contact point.""" def __init__( self, - alternateNames: Optional[Array[str]] = None, - availableLanguages: Optional[Array[str]] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, - emails: Optional[Array[str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, - telephoneNumbers: Optional[Array[str]] = None, - url: Optional[str] = None + alternateNames: Optional[Array[String]] = None, + availableLanguages: Optional[Array[String]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, + emails: Optional[Array[String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, + telephoneNumbers: Optional[Array[String]] = None, + url: Optional[String] = None ) -> None: super().__init__( alternateNames=alternateNames, @@ -629,7 +636,7 @@ class CreativeWork(Thing): comments: Optional[Array["Comment"]] = None """Comments about this creative work.""" - content: Optional[Union[Array["Any"], str]] = None + content: Optional[Union[Array[Any], String]] = None """The structured content of this creative work c.f. property `text`.""" dateAccepted: Optional["Date"] = None @@ -656,19 +663,19 @@ class CreativeWork(Thing): funders: Optional[Array[Union["Person", "Organization"]]] = None """People or organizations that funded the `CreativeWork`.""" - genre: Optional[Array[str]] = None + genre: Optional[Array[String]] = None """Genre of the creative work, broadcast channel or group.""" isPartOf: Optional["CreativeWorkTypes"] = None """An item or other CreativeWork that this CreativeWork is a part of. """ - keywords: Optional[Array[str]] = None + keywords: Optional[Array[String]] = None """Keywords or tags used to describe this content. Multiple entries in a keywords list are typically delimited by commas. """ - licenses: Optional[Array[Union["CreativeWorkTypes", str]]] = None + licenses: Optional[Array[Union["CreativeWorkTypes", String]]] = None """License documents that applies to this content, typically indicated by URL. """ @@ -684,54 +691,54 @@ class CreativeWork(Thing): """A publisher of the CreativeWork. """ - references: Optional[Array[Union["CreativeWorkTypes", str]]] = None + references: Optional[Array[Union["CreativeWorkTypes", String]]] = None """References to other creative works, such as another publication, web page, scholarly article, etc. """ - text: Optional[str] = None + text: Optional[String] = None """The textual content of this creative work.""" - title: Optional[Union[Array["InlineContent"], str]] = None + title: Optional[Union[Array["InlineContent"], String]] = None """The title of the creative work.""" - version: Optional[Union[str, float]] = None + version: Optional[Union[String, Number]] = None """The version of the creative work.""" def __init__( self, about: Optional[Array["ThingTypes"]] = None, - alternateNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, authors: Optional[Array[Union["Person", "Organization"]]] = None, comments: Optional[Array["Comment"]] = None, - content: Optional[Union[Array["Any"], str]] = None, + content: Optional[Union[Array[Any], String]] = None, dateAccepted: Optional["Date"] = None, dateCreated: Optional["Date"] = None, dateModified: Optional["Date"] = None, datePublished: Optional["Date"] = None, dateReceived: Optional["Date"] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, editors: Optional[Array["Person"]] = None, fundedBy: Optional[Array[Union["Grant", "MonetaryGrant"]]] = None, funders: Optional[Array[Union["Person", "Organization"]]] = None, - genre: Optional[Array[str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, + genre: Optional[Array[String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, isPartOf: Optional["CreativeWorkTypes"] = None, - keywords: Optional[Array[str]] = None, - licenses: Optional[Array[Union["CreativeWorkTypes", str]]] = None, + keywords: Optional[Array[String]] = None, + licenses: Optional[Array[Union["CreativeWorkTypes", String]]] = None, maintainers: Optional[Array[Union["Person", "Organization"]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, parts: Optional[Array["CreativeWorkTypes"]] = None, publisher: Optional[Union["Person", "Organization"]] = None, - references: Optional[Array[Union["CreativeWorkTypes", str]]] = None, - text: Optional[str] = None, - title: Optional[Union[Array["InlineContent"], str]] = None, - url: Optional[str] = None, - version: Optional[Union[str, float]] = None + references: Optional[Array[Union["CreativeWorkTypes", String]]] = None, + text: Optional[String] = None, + title: Optional[Union[Array["InlineContent"], String]] = None, + url: Optional[String] = None, + version: Optional[Union[String, Number]] = None ) -> None: super().__init__( alternateNames=alternateNames, @@ -797,13 +804,13 @@ class Article(CreativeWork): content: Optional[Array["BlockContent"]] = None # type: ignore """The structured content of this article.""" - pageEnd: Optional[Union[int, str]] = None + pageEnd: Optional[Union[Integer, String]] = None """The page on which the article ends; for example "138" or "xvi".""" - pageStart: Optional[Union[int, str]] = None + pageStart: Optional[Union[Integer, String]] = None """The page on which the article starts; for example "135" or "xiii".""" - pagination: Optional[str] = None + pagination: Optional[String] = None """Any description of pages that is not separated into pageStart and pageEnd; for example, "1-6, 9, 55". """ @@ -812,7 +819,7 @@ class Article(CreativeWork): def __init__( self, about: Optional[Array["ThingTypes"]] = None, - alternateNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, authors: Optional[Array[Union["Person", "Organization"]]] = None, comments: Optional[Array["Comment"]] = None, content: Optional[Array["BlockContent"]] = None, @@ -821,30 +828,30 @@ def __init__( dateModified: Optional["Date"] = None, datePublished: Optional["Date"] = None, dateReceived: Optional["Date"] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, editors: Optional[Array["Person"]] = None, fundedBy: Optional[Array[Union["Grant", "MonetaryGrant"]]] = None, funders: Optional[Array[Union["Person", "Organization"]]] = None, - genre: Optional[Array[str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, + genre: Optional[Array[String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, isPartOf: Optional["CreativeWorkTypes"] = None, - keywords: Optional[Array[str]] = None, - licenses: Optional[Array[Union["CreativeWorkTypes", str]]] = None, + keywords: Optional[Array[String]] = None, + licenses: Optional[Array[Union["CreativeWorkTypes", String]]] = None, maintainers: Optional[Array[Union["Person", "Organization"]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, - pageEnd: Optional[Union[int, str]] = None, - pageStart: Optional[Union[int, str]] = None, - pagination: Optional[str] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, + pageEnd: Optional[Union[Integer, String]] = None, + pageStart: Optional[Union[Integer, String]] = None, + pagination: Optional[String] = None, parts: Optional[Array["CreativeWorkTypes"]] = None, publisher: Optional[Union["Person", "Organization"]] = None, - references: Optional[Array[Union["CreativeWorkTypes", str]]] = None, - text: Optional[str] = None, - title: Optional[Union[Array["InlineContent"], str]] = None, - url: Optional[str] = None, - version: Optional[Union[str, float]] = None + references: Optional[Array[Union["CreativeWorkTypes", String]]] = None, + text: Optional[String] = None, + title: Optional[Union[Array["InlineContent"], String]] = None, + url: Optional[String] = None, + version: Optional[Union[String, Number]] = None ) -> None: super().__init__( about=about, @@ -897,7 +904,7 @@ class Claim(CreativeWork): claimType: Optional["EClaimType"] = None """Kind of the claim.""" - label: Optional[str] = None + label: Optional[String] = None """A short label for the claim.""" @@ -905,7 +912,7 @@ def __init__( self, content: Array["BlockContent"], about: Optional[Array["ThingTypes"]] = None, - alternateNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, authors: Optional[Array[Union["Person", "Organization"]]] = None, claimType: Optional["EClaimType"] = None, comments: Optional[Array["Comment"]] = None, @@ -914,28 +921,28 @@ def __init__( dateModified: Optional["Date"] = None, datePublished: Optional["Date"] = None, dateReceived: Optional["Date"] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, editors: Optional[Array["Person"]] = None, fundedBy: Optional[Array[Union["Grant", "MonetaryGrant"]]] = None, funders: Optional[Array[Union["Person", "Organization"]]] = None, - genre: Optional[Array[str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, + genre: Optional[Array[String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, isPartOf: Optional["CreativeWorkTypes"] = None, - keywords: Optional[Array[str]] = None, - label: Optional[str] = None, - licenses: Optional[Array[Union["CreativeWorkTypes", str]]] = None, + keywords: Optional[Array[String]] = None, + label: Optional[String] = None, + licenses: Optional[Array[Union["CreativeWorkTypes", String]]] = None, maintainers: Optional[Array[Union["Person", "Organization"]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, parts: Optional[Array["CreativeWorkTypes"]] = None, publisher: Optional[Union["Person", "Organization"]] = None, - references: Optional[Array[Union["CreativeWorkTypes", str]]] = None, - text: Optional[str] = None, - title: Optional[Union[Array["InlineContent"], str]] = None, - url: Optional[str] = None, - version: Optional[Union[str, float]] = None + references: Optional[Array[Union["CreativeWorkTypes", String]]] = None, + text: Optional[String] = None, + title: Optional[Union[Array["InlineContent"], String]] = None, + url: Optional[String] = None, + version: Optional[Union[String, Number]] = None ) -> None: super().__init__( about=about, @@ -990,35 +997,35 @@ def __init__( self, parts: Array["CreativeWorkTypes"], about: Optional[Array["ThingTypes"]] = None, - alternateNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, authors: Optional[Array[Union["Person", "Organization"]]] = None, comments: Optional[Array["Comment"]] = None, - content: Optional[Union[Array["Any"], str]] = None, + content: Optional[Union[Array[Any], String]] = None, dateAccepted: Optional["Date"] = None, dateCreated: Optional["Date"] = None, dateModified: Optional["Date"] = None, datePublished: Optional["Date"] = None, dateReceived: Optional["Date"] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, editors: Optional[Array["Person"]] = None, fundedBy: Optional[Array[Union["Grant", "MonetaryGrant"]]] = None, funders: Optional[Array[Union["Person", "Organization"]]] = None, - genre: Optional[Array[str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, + genre: Optional[Array[String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, isPartOf: Optional["CreativeWorkTypes"] = None, - keywords: Optional[Array[str]] = None, - licenses: Optional[Array[Union["CreativeWorkTypes", str]]] = None, + keywords: Optional[Array[String]] = None, + licenses: Optional[Array[Union["CreativeWorkTypes", String]]] = None, maintainers: Optional[Array[Union["Person", "Organization"]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, publisher: Optional[Union["Person", "Organization"]] = None, - references: Optional[Array[Union["CreativeWorkTypes", str]]] = None, - text: Optional[str] = None, - title: Optional[Union[Array["InlineContent"], str]] = None, - url: Optional[str] = None, - version: Optional[Union[str, float]] = None + references: Optional[Array[Union["CreativeWorkTypes", String]]] = None, + text: Optional[String] = None, + title: Optional[Union[Array["InlineContent"], String]] = None, + url: Optional[String] = None, + version: Optional[Union[String, Number]] = None ) -> None: super().__init__( parts=parts, @@ -1060,7 +1067,7 @@ def __init__( class Comment(CreativeWork): """A comment on an item, e.g on a Article, or SoftwareSourceCode.""" - commentAspect: Optional[str] = None + commentAspect: Optional[String] = None """The part or facet of the item that is being commented on.""" parentItem: Optional["Comment"] = None @@ -1070,38 +1077,38 @@ class Comment(CreativeWork): def __init__( self, about: Optional[Array["ThingTypes"]] = None, - alternateNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, authors: Optional[Array[Union["Person", "Organization"]]] = None, - commentAspect: Optional[str] = None, + commentAspect: Optional[String] = None, comments: Optional[Array["Comment"]] = None, - content: Optional[Union[Array["Any"], str]] = None, + content: Optional[Union[Array[Any], String]] = None, dateAccepted: Optional["Date"] = None, dateCreated: Optional["Date"] = None, dateModified: Optional["Date"] = None, datePublished: Optional["Date"] = None, dateReceived: Optional["Date"] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, editors: Optional[Array["Person"]] = None, fundedBy: Optional[Array[Union["Grant", "MonetaryGrant"]]] = None, funders: Optional[Array[Union["Person", "Organization"]]] = None, - genre: Optional[Array[str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, + genre: Optional[Array[String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, isPartOf: Optional["CreativeWorkTypes"] = None, - keywords: Optional[Array[str]] = None, - licenses: Optional[Array[Union["CreativeWorkTypes", str]]] = None, + keywords: Optional[Array[String]] = None, + licenses: Optional[Array[Union["CreativeWorkTypes", String]]] = None, maintainers: Optional[Array[Union["Person", "Organization"]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, parentItem: Optional["Comment"] = None, parts: Optional[Array["CreativeWorkTypes"]] = None, publisher: Optional[Union["Person", "Organization"]] = None, - references: Optional[Array[Union["CreativeWorkTypes", str]]] = None, - text: Optional[str] = None, - title: Optional[Union[Array["InlineContent"], str]] = None, - url: Optional[str] = None, - version: Optional[Union[str, float]] = None + references: Optional[Array[Union["CreativeWorkTypes", String]]] = None, + text: Optional[String] = None, + title: Optional[Union[Array["InlineContent"], String]] = None, + url: Optional[String] = None, + version: Optional[Union[String, Number]] = None ) -> None: super().__init__( about=about, @@ -1153,36 +1160,36 @@ def __init__( self, columns: Array["DatatableColumn"], about: Optional[Array["ThingTypes"]] = None, - alternateNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, authors: Optional[Array[Union["Person", "Organization"]]] = None, comments: Optional[Array["Comment"]] = None, - content: Optional[Union[Array["Any"], str]] = None, + content: Optional[Union[Array[Any], String]] = None, dateAccepted: Optional["Date"] = None, dateCreated: Optional["Date"] = None, dateModified: Optional["Date"] = None, datePublished: Optional["Date"] = None, dateReceived: Optional["Date"] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, editors: Optional[Array["Person"]] = None, fundedBy: Optional[Array[Union["Grant", "MonetaryGrant"]]] = None, funders: Optional[Array[Union["Person", "Organization"]]] = None, - genre: Optional[Array[str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, + genre: Optional[Array[String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, isPartOf: Optional["CreativeWorkTypes"] = None, - keywords: Optional[Array[str]] = None, - licenses: Optional[Array[Union["CreativeWorkTypes", str]]] = None, + keywords: Optional[Array[String]] = None, + licenses: Optional[Array[Union["CreativeWorkTypes", String]]] = None, maintainers: Optional[Array[Union["Person", "Organization"]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, parts: Optional[Array["CreativeWorkTypes"]] = None, publisher: Optional[Union["Person", "Organization"]] = None, - references: Optional[Array[Union["CreativeWorkTypes", str]]] = None, - text: Optional[str] = None, - title: Optional[Union[Array["InlineContent"], str]] = None, - url: Optional[str] = None, - version: Optional[Union[str, float]] = None + references: Optional[Array[Union["CreativeWorkTypes", String]]] = None, + text: Optional[String] = None, + title: Optional[Union[Array["InlineContent"], String]] = None, + url: Optional[String] = None, + version: Optional[Union[String, Number]] = None ) -> None: super().__init__( about=about, @@ -1227,64 +1234,64 @@ class MediaObject(CreativeWork): page or a downloadable dataset. """ - contentUrl: str + contentUrl: String """URL for the actual bytes of the media object, for example the image file or video file. """ - bitrate: Optional[float] = None + bitrate: Optional[Number] = None """Bitrate in megabits per second (Mbit/s, Mb/s, Mbps). """ - contentSize: Optional[float] = None + contentSize: Optional[Number] = None """File size in megabits (Mbit, Mb). """ - embedUrl: Optional[str] = None + embedUrl: Optional[String] = None """URL that can be used to embed the media on a web page via a specific media player. """ - mediaType: Optional[str] = None + mediaType: Optional[String] = None """IANA media type (MIME type).""" def __init__( self, - contentUrl: str, + contentUrl: String, about: Optional[Array["ThingTypes"]] = None, - alternateNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, authors: Optional[Array[Union["Person", "Organization"]]] = None, - bitrate: Optional[float] = None, + bitrate: Optional[Number] = None, comments: Optional[Array["Comment"]] = None, - content: Optional[Union[Array["Any"], str]] = None, - contentSize: Optional[float] = None, + content: Optional[Union[Array[Any], String]] = None, + contentSize: Optional[Number] = None, dateAccepted: Optional["Date"] = None, dateCreated: Optional["Date"] = None, dateModified: Optional["Date"] = None, datePublished: Optional["Date"] = None, dateReceived: Optional["Date"] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, editors: Optional[Array["Person"]] = None, - embedUrl: Optional[str] = None, + embedUrl: Optional[String] = None, fundedBy: Optional[Array[Union["Grant", "MonetaryGrant"]]] = None, funders: Optional[Array[Union["Person", "Organization"]]] = None, - genre: Optional[Array[str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, + genre: Optional[Array[String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, isPartOf: Optional["CreativeWorkTypes"] = None, - keywords: Optional[Array[str]] = None, - licenses: Optional[Array[Union["CreativeWorkTypes", str]]] = None, + keywords: Optional[Array[String]] = None, + licenses: Optional[Array[Union["CreativeWorkTypes", String]]] = None, maintainers: Optional[Array[Union["Person", "Organization"]]] = None, - mediaType: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, + mediaType: Optional[String] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, parts: Optional[Array["CreativeWorkTypes"]] = None, publisher: Optional[Union["Person", "Organization"]] = None, - references: Optional[Array[Union["CreativeWorkTypes", str]]] = None, - text: Optional[str] = None, - title: Optional[Union[Array["InlineContent"], str]] = None, - url: Optional[str] = None, - version: Optional[Union[str, float]] = None + references: Optional[Array[Union["CreativeWorkTypes", String]]] = None, + text: Optional[String] = None, + title: Optional[Union[Array["InlineContent"], String]] = None, + url: Optional[String] = None, + version: Optional[Union[String, Number]] = None ) -> None: super().__init__( about=about, @@ -1334,53 +1341,53 @@ def __init__( class AudioObject(MediaObject): """An audio file""" - caption: Optional[str] = None + caption: Optional[String] = None """The caption for this audio recording.""" - transcript: Optional[str] = None + transcript: Optional[String] = None """The transcript of this audio recording.""" def __init__( self, - contentUrl: str, + contentUrl: String, about: Optional[Array["ThingTypes"]] = None, - alternateNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, authors: Optional[Array[Union["Person", "Organization"]]] = None, - bitrate: Optional[float] = None, - caption: Optional[str] = None, + bitrate: Optional[Number] = None, + caption: Optional[String] = None, comments: Optional[Array["Comment"]] = None, - content: Optional[Union[Array["Any"], str]] = None, - contentSize: Optional[float] = None, + content: Optional[Union[Array[Any], String]] = None, + contentSize: Optional[Number] = None, dateAccepted: Optional["Date"] = None, dateCreated: Optional["Date"] = None, dateModified: Optional["Date"] = None, datePublished: Optional["Date"] = None, dateReceived: Optional["Date"] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, editors: Optional[Array["Person"]] = None, - embedUrl: Optional[str] = None, + embedUrl: Optional[String] = None, fundedBy: Optional[Array[Union["Grant", "MonetaryGrant"]]] = None, funders: Optional[Array[Union["Person", "Organization"]]] = None, - genre: Optional[Array[str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, + genre: Optional[Array[String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, isPartOf: Optional["CreativeWorkTypes"] = None, - keywords: Optional[Array[str]] = None, - licenses: Optional[Array[Union["CreativeWorkTypes", str]]] = None, + keywords: Optional[Array[String]] = None, + licenses: Optional[Array[Union["CreativeWorkTypes", String]]] = None, maintainers: Optional[Array[Union["Person", "Organization"]]] = None, - mediaType: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, + mediaType: Optional[String] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, parts: Optional[Array["CreativeWorkTypes"]] = None, publisher: Optional[Union["Person", "Organization"]] = None, - references: Optional[Array[Union["CreativeWorkTypes", str]]] = None, - text: Optional[str] = None, - title: Optional[Union[Array["InlineContent"], str]] = None, - transcript: Optional[str] = None, - url: Optional[str] = None, - version: Optional[Union[str, float]] = None + references: Optional[Array[Union["CreativeWorkTypes", String]]] = None, + text: Optional[String] = None, + title: Optional[Union[Array["InlineContent"], String]] = None, + transcript: Optional[String] = None, + url: Optional[String] = None, + version: Optional[Union[String, Number]] = None ) -> None: super().__init__( contentUrl=contentUrl, @@ -1429,10 +1436,10 @@ def __init__( class DatatableColumn(Thing): """A column of data within a Datatable.""" - name: str # type: ignore + name: String # type: ignore """The name of the item.""" - values: Array["Any"] + values: Array[Any] """The data values of the column.""" validator: Optional["ArrayValidator"] = None @@ -1441,15 +1448,15 @@ class DatatableColumn(Thing): def __init__( self, - name: str, - values: Array["Any"], - alternateNames: Optional[Array[str]] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, - meta: Optional[Dict[str, Any]] = None, - url: Optional[str] = None, + name: String, + values: Array[Any], + alternateNames: Optional[Array[String]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, + meta: Optional[Object] = None, + url: Optional[String] = None, validator: Optional["ArrayValidator"] = None ) -> None: super().__init__( @@ -1473,24 +1480,24 @@ def __init__( class DefinedTerm(Thing): """A word, name, acronym, phrase, etc. with a formal definition.""" - name: str # type: ignore + name: String # type: ignore """The name of the item.""" - termCode: Optional[str] = None + termCode: Optional[String] = None """A code that identifies this DefinedTerm within a DefinedTermSet""" def __init__( self, - name: str, - alternateNames: Optional[Array[str]] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, - meta: Optional[Dict[str, Any]] = None, - termCode: Optional[str] = None, - url: Optional[str] = None + name: String, + alternateNames: Optional[Array[String]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, + meta: Optional[Object] = None, + termCode: Optional[String] = None, + url: Optional[String] = None ) -> None: super().__init__( name=name, @@ -1513,8 +1520,8 @@ class Validator(Entity): def __init__( self, - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + id: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( id=id, @@ -1532,25 +1539,25 @@ class ArrayValidator(Validator): itemsValidator: Optional["ValidatorTypes"] = None """Another validator node specifying the constraints on all items in the array.""" - maxItems: Optional[int] = None + maxItems: Optional[Integer] = None """An array node is valid if its size is less than, or equal to, this value.""" - minItems: Optional[int] = None + minItems: Optional[Integer] = None """An array node is valid if its size is greater than, or equal to, this value.""" - uniqueItems: Optional[bool] = None + uniqueItems: Optional[Boolean] = None """A flag to indicate that each value in the array should be unique.""" def __init__( self, contains: Optional["ValidatorTypes"] = None, - id: Optional[str] = None, + id: Optional[String] = None, itemsValidator: Optional["ValidatorTypes"] = None, - maxItems: Optional[int] = None, - meta: Optional[Dict[str, Any]] = None, - minItems: Optional[int] = None, - uniqueItems: Optional[bool] = None + maxItems: Optional[Integer] = None, + meta: Optional[Object] = None, + minItems: Optional[Integer] = None, + uniqueItems: Optional[Boolean] = None ) -> None: super().__init__( id=id, @@ -1573,8 +1580,8 @@ class BooleanValidator(Validator): def __init__( self, - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + id: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( id=id, @@ -1586,15 +1593,15 @@ def __init__( class ConstantValidator(Validator): """A validator specifying a constant value that a node must have.""" - value: Optional["Any"] = None + value: Optional[Any] = None """The value that the node must have.""" def __init__( self, - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, - value: Optional["Any"] = None + id: Optional[String] = None, + meta: Optional[Object] = None, + value: Optional[Any] = None ) -> None: super().__init__( id=id, @@ -1607,15 +1614,15 @@ def __init__( class EnumValidator(Validator): """A schema specifying that a node must be one of several values.""" - values: Optional[Array["Any"]] = None + values: Optional[Array[Any]] = None """A node is valid if it is equal to any of these values.""" def __init__( self, - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, - values: Optional[Array["Any"]] = None + id: Optional[String] = None, + meta: Optional[Object] = None, + values: Optional[Array[Any]] = None ) -> None: super().__init__( id=id, @@ -1633,14 +1640,14 @@ class Enumeration(Thing): def __init__( self, - alternateNames: Optional[Array[str]] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, - url: Optional[str] = None + alternateNames: Optional[Array[String]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, + url: Optional[String] = None ) -> None: super().__init__( alternateNames=alternateNames, @@ -1661,48 +1668,48 @@ class Figure(CreativeWork): and labels for them. """ - caption: Optional[Union[Array["BlockContent"], str]] = None + caption: Optional[Union[Array["BlockContent"], String]] = None """A caption for the figure.""" - label: Optional[str] = None + label: Optional[String] = None """A short label for the figure.""" def __init__( self, about: Optional[Array["ThingTypes"]] = None, - alternateNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, authors: Optional[Array[Union["Person", "Organization"]]] = None, - caption: Optional[Union[Array["BlockContent"], str]] = None, + caption: Optional[Union[Array["BlockContent"], String]] = None, comments: Optional[Array["Comment"]] = None, - content: Optional[Union[Array["Any"], str]] = None, + content: Optional[Union[Array[Any], String]] = None, dateAccepted: Optional["Date"] = None, dateCreated: Optional["Date"] = None, dateModified: Optional["Date"] = None, datePublished: Optional["Date"] = None, dateReceived: Optional["Date"] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, editors: Optional[Array["Person"]] = None, fundedBy: Optional[Array[Union["Grant", "MonetaryGrant"]]] = None, funders: Optional[Array[Union["Person", "Organization"]]] = None, - genre: Optional[Array[str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, + genre: Optional[Array[String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, isPartOf: Optional["CreativeWorkTypes"] = None, - keywords: Optional[Array[str]] = None, - label: Optional[str] = None, - licenses: Optional[Array[Union["CreativeWorkTypes", str]]] = None, + keywords: Optional[Array[String]] = None, + label: Optional[String] = None, + licenses: Optional[Array[Union["CreativeWorkTypes", String]]] = None, maintainers: Optional[Array[Union["Person", "Organization"]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, parts: Optional[Array["CreativeWorkTypes"]] = None, publisher: Optional[Union["Person", "Organization"]] = None, - references: Optional[Array[Union["CreativeWorkTypes", str]]] = None, - text: Optional[str] = None, - title: Optional[Union[Array["InlineContent"], str]] = None, - url: Optional[str] = None, - version: Optional[Union[str, float]] = None + references: Optional[Array[Union["CreativeWorkTypes", String]]] = None, + text: Optional[String] = None, + title: Optional[Union[Array["InlineContent"], String]] = None, + url: Optional[String] = None, + version: Optional[Union[String, Number]] = None ) -> None: super().__init__( about=about, @@ -1749,7 +1756,7 @@ class Function(Entity): certain type. """ - name: Optional[str] = None + name: Optional[String] = None """The name of the function.""" parameters: Optional[Array["Parameter"]] = None @@ -1761,9 +1768,9 @@ class Function(Entity): def __init__( self, - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, + id: Optional[String] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, parameters: Optional[Array["Parameter"]] = None, returns: Optional["ValidatorTypes"] = None ) -> None: @@ -1791,16 +1798,16 @@ class Grant(Thing): def __init__( self, - alternateNames: Optional[Array[str]] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + alternateNames: Optional[Array[String]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, fundedItems: Optional[Array["Thing"]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, sponsors: Optional[Array[Union["Person", "Organization"]]] = None, - url: Optional[str] = None + url: Optional[String] = None ) -> None: super().__init__( alternateNames=alternateNames, @@ -1824,16 +1831,16 @@ class Heading(Entity): content: Array["InlineContent"] """Content of the heading.""" - depth: Optional[int] = None + depth: Optional[Integer] = None """The depth of the heading.""" def __init__( self, content: Array["InlineContent"], - depth: Optional[int] = None, - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + depth: Optional[Integer] = None, + id: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( id=id, @@ -1848,7 +1855,7 @@ def __init__( class ImageObject(MediaObject): """An image file.""" - caption: Optional[str] = None + caption: Optional[String] = None """The caption for this image.""" thumbnail: Optional["ImageObject"] = None @@ -1857,44 +1864,44 @@ class ImageObject(MediaObject): def __init__( self, - contentUrl: str, + contentUrl: String, about: Optional[Array["ThingTypes"]] = None, - alternateNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, authors: Optional[Array[Union["Person", "Organization"]]] = None, - bitrate: Optional[float] = None, - caption: Optional[str] = None, + bitrate: Optional[Number] = None, + caption: Optional[String] = None, comments: Optional[Array["Comment"]] = None, - content: Optional[Union[Array["Any"], str]] = None, - contentSize: Optional[float] = None, + content: Optional[Union[Array[Any], String]] = None, + contentSize: Optional[Number] = None, dateAccepted: Optional["Date"] = None, dateCreated: Optional["Date"] = None, dateModified: Optional["Date"] = None, datePublished: Optional["Date"] = None, dateReceived: Optional["Date"] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, editors: Optional[Array["Person"]] = None, - embedUrl: Optional[str] = None, + embedUrl: Optional[String] = None, fundedBy: Optional[Array[Union["Grant", "MonetaryGrant"]]] = None, funders: Optional[Array[Union["Person", "Organization"]]] = None, - genre: Optional[Array[str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, + genre: Optional[Array[String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, isPartOf: Optional["CreativeWorkTypes"] = None, - keywords: Optional[Array[str]] = None, - licenses: Optional[Array[Union["CreativeWorkTypes", str]]] = None, + keywords: Optional[Array[String]] = None, + licenses: Optional[Array[Union["CreativeWorkTypes", String]]] = None, maintainers: Optional[Array[Union["Person", "Organization"]]] = None, - mediaType: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, + mediaType: Optional[String] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, parts: Optional[Array["CreativeWorkTypes"]] = None, publisher: Optional[Union["Person", "Organization"]] = None, - references: Optional[Array[Union["CreativeWorkTypes", str]]] = None, - text: Optional[str] = None, + references: Optional[Array[Union["CreativeWorkTypes", String]]] = None, + text: Optional[String] = None, thumbnail: Optional["ImageObject"] = None, - title: Optional[Union[Array["InlineContent"], str]] = None, - url: Optional[str] = None, - version: Optional[Union[str, float]] = None + title: Optional[Union[Array["InlineContent"], String]] = None, + url: Optional[String] = None, + version: Optional[Union[String, Number]] = None ) -> None: super().__init__( contentUrl=contentUrl, @@ -1946,23 +1953,23 @@ class Include(Entity): content. """ - source: str + source: String """The source of the content, a URL or file path, or the content itself.""" content: Optional[Array["BlockContent"]] = None """The content to be included.""" - mediaType: Optional[str] = None + mediaType: Optional[String] = None """Media type, typically expressed using a MIME format, of the source content.""" def __init__( self, - source: str, + source: String, content: Optional[Array["BlockContent"]] = None, - id: Optional[str] = None, - mediaType: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + id: Optional[String] = None, + mediaType: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( id=id, @@ -1981,8 +1988,8 @@ class IntegerValidator(Validator): def __init__( self, - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + id: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( id=id, @@ -2000,36 +2007,36 @@ class Link(Entity): content: Array["InlineContent"] """The textual content of the link.""" - target: str + target: String """The target of the link.""" - exportFrom: Optional[str] = None + exportFrom: Optional[String] = None """A compilation directive giving the name of the variable to export to the link target. """ - importTo: Optional[str] = None + importTo: Optional[String] = None """A compilation directive giving the name of the variable to import the link target as. """ - relation: Optional[str] = None + relation: Optional[String] = None """The relation between the target and the current thing.""" - title: Optional[str] = None + title: Optional[String] = None """A title for the link.""" def __init__( self, content: Array["InlineContent"], - target: str, - exportFrom: Optional[str] = None, - id: Optional[str] = None, - importTo: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, - relation: Optional[str] = None, - title: Optional[str] = None + target: String, + exportFrom: Optional[String] = None, + id: Optional[String] = None, + importTo: Optional[String] = None, + meta: Optional[Object] = None, + relation: Optional[String] = None, + title: Optional[String] = None ) -> None: super().__init__( id=id, @@ -2062,8 +2069,8 @@ class List(Entity): def __init__( self, items: Array["ListItem"], - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, + id: Optional[String] = None, + meta: Optional[Object] = None, order: Optional["EItemListOrder"] = None ) -> None: super().__init__( @@ -2082,30 +2089,30 @@ class ListItem(Thing): content: Optional[Union[Array["BlockContent"], Array["InlineContent"]]] = None """The content of the list item.""" - isChecked: Optional[bool] = None + isChecked: Optional[Boolean] = None """A flag to indicate if this list item is checked.""" - item: Optional["Any"] = None + item: Optional[Any] = None """The item represented by this list item.""" - position: Optional[int] = None + position: Optional[Integer] = None """The position of the item in a series or sequence of items.""" def __init__( self, - alternateNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, content: Optional[Union[Array["BlockContent"], Array["InlineContent"]]] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, - isChecked: Optional[bool] = None, - item: Optional["Any"] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, - position: Optional[int] = None, - url: Optional[str] = None + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, + isChecked: Optional[Boolean] = None, + item: Optional[Any] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, + position: Optional[Integer] = None, + url: Optional[String] = None ) -> None: super().__init__( alternateNames=alternateNames, @@ -2130,23 +2137,23 @@ def __init__( class Math(Entity): """A mathematical variable or equation.""" - text: str + text: String """The text of the equation in the language.""" - errors: Optional[Array[str]] = None + errors: Optional[Array[String]] = None """Errors that occurred when parsing the math equation.""" - mathLanguage: Optional[str] = None + mathLanguage: Optional[String] = None """The language used for the equation e.g tex, mathml, asciimath.""" def __init__( self, - text: str, - errors: Optional[Array[str]] = None, - id: Optional[str] = None, - mathLanguage: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + text: String, + errors: Optional[Array[String]] = None, + id: Optional[String] = None, + mathLanguage: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( id=id, @@ -2163,18 +2170,18 @@ def __init__( class MathBlock(Math): """A block of math, e.g an equation, to be treated as block content.""" - label: Optional[str] = None + label: Optional[String] = None """A short label for the math block.""" def __init__( self, - text: str, - errors: Optional[Array[str]] = None, - id: Optional[str] = None, - label: Optional[str] = None, - mathLanguage: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + text: String, + errors: Optional[Array[String]] = None, + id: Optional[String] = None, + label: Optional[String] = None, + mathLanguage: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( text=text, @@ -2194,11 +2201,11 @@ class MathFragment(Math): def __init__( self, - text: str, - errors: Optional[Array[str]] = None, - id: Optional[str] = None, - mathLanguage: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + text: String, + errors: Optional[Array[String]] = None, + id: Optional[String] = None, + mathLanguage: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( text=text, @@ -2213,7 +2220,7 @@ def __init__( class MonetaryGrant(Grant): """A monetary grant.""" - amounts: Optional[float] = None + amounts: Optional[Number] = None """The amount of money.""" funders: Optional[Array[Union["Person", "Organization"]]] = None @@ -2223,18 +2230,18 @@ class MonetaryGrant(Grant): def __init__( self, - alternateNames: Optional[Array[str]] = None, - amounts: Optional[float] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + alternateNames: Optional[Array[String]] = None, + amounts: Optional[Number] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, fundedItems: Optional[Array["Thing"]] = None, funders: Optional[Array[Union["Person", "Organization"]]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, sponsors: Optional[Array[Union["Person", "Organization"]]] = None, - url: Optional[str] = None + url: Optional[String] = None ) -> None: super().__init__( alternateNames=alternateNames, @@ -2260,8 +2267,8 @@ class NontextualAnnotation(Mark): def __init__( self, content: Array["InlineContent"], - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + id: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( content=content, @@ -2286,8 +2293,8 @@ class Note(Entity): def __init__( self, content: Array["BlockContent"], - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, + id: Optional[String] = None, + meta: Optional[Object] = None, noteType: Optional["ENoteType"] = None ) -> None: super().__init__( @@ -2303,31 +2310,31 @@ def __init__( class NumberValidator(Validator): """A validator specifying the constraints on a numeric node.""" - exclusiveMaximum: Optional[float] = None + exclusiveMaximum: Optional[Number] = None """The exclusive upper limit for a numeric node.""" - exclusiveMinimum: Optional[float] = None + exclusiveMinimum: Optional[Number] = None """The exclusive lower limit for a numeric node.""" - maximum: Optional[float] = None + maximum: Optional[Number] = None """The inclusive upper limit for a numeric node.""" - minimum: Optional[float] = None + minimum: Optional[Number] = None """The inclusive lower limit for a numeric node.""" - multipleOf: Optional[float] = None + multipleOf: Optional[Number] = None """A number that a numeric node must be a multiple of.""" def __init__( self, - exclusiveMaximum: Optional[float] = None, - exclusiveMinimum: Optional[float] = None, - id: Optional[str] = None, - maximum: Optional[float] = None, - meta: Optional[Dict[str, Any]] = None, - minimum: Optional[float] = None, - multipleOf: Optional[float] = None + exclusiveMaximum: Optional[Number] = None, + exclusiveMinimum: Optional[Number] = None, + id: Optional[String] = None, + maximum: Optional[Number] = None, + meta: Optional[Object] = None, + minimum: Optional[Number] = None, + multipleOf: Optional[Number] = None ) -> None: super().__init__( id=id, @@ -2348,7 +2355,7 @@ def __init__( class Organization(Thing): """An organization such as a school, NGO, corporation, club, etc.""" - address: Optional[Union["PostalAddress", str]] = None + address: Optional[Union["PostalAddress", String]] = None """Postal address for the organization. """ @@ -2368,11 +2375,11 @@ class Organization(Thing): """Organization(s) or person(s) funding the organization. """ - legalName: Optional[str] = None + legalName: Optional[String] = None """Legal name for the Organization. Should only include letters and spaces. """ - logo: Optional[Union["ImageObject", str]] = None + logo: Optional[Union["ImageObject", String]] = None """The logo of the organization.""" members: Optional[Array[Union["Organization", "Person"]]] = None @@ -2386,23 +2393,23 @@ class Organization(Thing): def __init__( self, - address: Optional[Union["PostalAddress", str]] = None, - alternateNames: Optional[Array[str]] = None, + address: Optional[Union["PostalAddress", String]] = None, + alternateNames: Optional[Array[String]] = None, brands: Optional[Array["Brand"]] = None, contactPoints: Optional[Array["ContactPoint"]] = None, departments: Optional[Array["Organization"]] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, funders: Optional[Array[Union["Organization", "Person"]]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, - legalName: Optional[str] = None, - logo: Optional[Union["ImageObject", str]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, + legalName: Optional[String] = None, + logo: Optional[Union["ImageObject", String]] = None, members: Optional[Array[Union["Organization", "Person"]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, parentOrganization: Optional["Organization"] = None, - url: Optional[str] = None + url: Optional[String] = None ) -> None: super().__init__( alternateNames=alternateNames, @@ -2444,8 +2451,8 @@ class Paragraph(Entity): def __init__( self, content: Array["InlineContent"], - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + id: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( id=id, @@ -2458,27 +2465,27 @@ def __init__( class Variable(Entity): """A variable representing a name / value pair.""" - name: str + name: String """The name of the variable.""" - isReadonly: Optional[bool] = None + isReadonly: Optional[Boolean] = None """Whether or not a property is mutable. Default is false.""" validator: Optional["ValidatorTypes"] = None """The validator that the value is validated against.""" - value: Optional["Any"] = None + value: Optional[Any] = None """The value of the variable.""" def __init__( self, - name: str, - id: Optional[str] = None, - isReadonly: Optional[bool] = None, - meta: Optional[Dict[str, Any]] = None, + name: String, + id: Optional[String] = None, + isReadonly: Optional[Boolean] = None, + meta: Optional[Object] = None, validator: Optional["ValidatorTypes"] = None, - value: Optional["Any"] = None + value: Optional[Any] = None ) -> None: super().__init__( id=id, @@ -2497,31 +2504,31 @@ def __init__( class Parameter(Variable): """A parameter that can be set and used in evaluated code.""" - default: Optional["Any"] = None + default: Optional[Any] = None """The default value of the parameter.""" - isExtensible: Optional[bool] = None + isExtensible: Optional[Boolean] = None """Indicates that this parameter is variadic and can accept multiple named arguments.""" - isRequired: Optional[bool] = None + isRequired: Optional[Boolean] = None """Is this parameter required, if not it should have a default or default is assumed to be null.""" - isVariadic: Optional[bool] = None + isVariadic: Optional[Boolean] = None """Indicates that this parameter is variadic and can accept multiple arguments.""" def __init__( self, - name: str, - default: Optional["Any"] = None, - id: Optional[str] = None, - isExtensible: Optional[bool] = None, - isReadonly: Optional[bool] = None, - isRequired: Optional[bool] = None, - isVariadic: Optional[bool] = None, - meta: Optional[Dict[str, Any]] = None, + name: String, + default: Optional[Any] = None, + id: Optional[String] = None, + isExtensible: Optional[Boolean] = None, + isReadonly: Optional[Boolean] = None, + isRequired: Optional[Boolean] = None, + isVariadic: Optional[Boolean] = None, + meta: Optional[Object] = None, validator: Optional["ValidatorTypes"] = None, - value: Optional["Any"] = None + value: Optional[Any] = None ) -> None: super().__init__( name=name, @@ -2550,17 +2557,17 @@ class Periodical(CreativeWork): dateStart: Optional["Date"] = None """The date this Periodical was first published.""" - issns: Optional[Array[str]] = None + issns: Optional[Array[String]] = None """The International Standard Serial Number(s) (ISSN) that identifies this serial publication.""" def __init__( self, about: Optional[Array["ThingTypes"]] = None, - alternateNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, authors: Optional[Array[Union["Person", "Organization"]]] = None, comments: Optional[Array["Comment"]] = None, - content: Optional[Union[Array["Any"], str]] = None, + content: Optional[Union[Array[Any], String]] = None, dateAccepted: Optional["Date"] = None, dateCreated: Optional["Date"] = None, dateEnd: Optional["Date"] = None, @@ -2568,28 +2575,28 @@ def __init__( datePublished: Optional["Date"] = None, dateReceived: Optional["Date"] = None, dateStart: Optional["Date"] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, editors: Optional[Array["Person"]] = None, fundedBy: Optional[Array[Union["Grant", "MonetaryGrant"]]] = None, funders: Optional[Array[Union["Person", "Organization"]]] = None, - genre: Optional[Array[str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, + genre: Optional[Array[String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, isPartOf: Optional["CreativeWorkTypes"] = None, - issns: Optional[Array[str]] = None, - keywords: Optional[Array[str]] = None, - licenses: Optional[Array[Union["CreativeWorkTypes", str]]] = None, + issns: Optional[Array[String]] = None, + keywords: Optional[Array[String]] = None, + licenses: Optional[Array[Union["CreativeWorkTypes", String]]] = None, maintainers: Optional[Array[Union["Person", "Organization"]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, parts: Optional[Array["CreativeWorkTypes"]] = None, publisher: Optional[Union["Person", "Organization"]] = None, - references: Optional[Array[Union["CreativeWorkTypes", str]]] = None, - text: Optional[str] = None, - title: Optional[Union[Array["InlineContent"], str]] = None, - url: Optional[str] = None, - version: Optional[Union[str, float]] = None + references: Optional[Array[Union["CreativeWorkTypes", String]]] = None, + text: Optional[String] = None, + title: Optional[Union[Array["InlineContent"], String]] = None, + url: Optional[String] = None, + version: Optional[Union[String, Number]] = None ) -> None: super().__init__( about=about, @@ -2635,16 +2642,16 @@ def __init__( class Person(Thing): """A person (alive, dead, undead, or fictional).""" - address: Optional[Union["PostalAddress", str]] = None + address: Optional[Union["PostalAddress", String]] = None """Postal address for the person.""" affiliations: Optional[Array["Organization"]] = None """Organizations that the person is affiliated with.""" - emails: Optional[Array[str]] = None + emails: Optional[Array[String]] = None """Email addresses for the person.""" - familyNames: Optional[Array[str]] = None + familyNames: Optional[Array[String]] = None """Family name. In the U.S., the last name of a person.""" funders: Optional[Array[Union["Organization", "Person"]]] = None @@ -2652,46 +2659,46 @@ class Person(Thing): some kind of financial contribution. """ - givenNames: Optional[Array[str]] = None + givenNames: Optional[Array[String]] = None """Given name. In the U.S., the first name of a person.""" - honorificPrefix: Optional[str] = None + honorificPrefix: Optional[String] = None """An honorific prefix preceding a person's name such as Dr/Mrs/Mr.""" - honorificSuffix: Optional[str] = None + honorificSuffix: Optional[String] = None """An honorific suffix after a person's name such as MD/PhD/MSCSW.""" - jobTitle: Optional[str] = None + jobTitle: Optional[String] = None """The job title of the person (for example, Financial Manager).""" memberOf: Optional[Array["Organization"]] = None """An organization (or program membership) to which this person belongs.""" - telephoneNumbers: Optional[Array[str]] = None + telephoneNumbers: Optional[Array[String]] = None """Telephone numbers for the person.""" def __init__( self, - address: Optional[Union["PostalAddress", str]] = None, + address: Optional[Union["PostalAddress", String]] = None, affiliations: Optional[Array["Organization"]] = None, - alternateNames: Optional[Array[str]] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, - emails: Optional[Array[str]] = None, - familyNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, + emails: Optional[Array[String]] = None, + familyNames: Optional[Array[String]] = None, funders: Optional[Array[Union["Organization", "Person"]]] = None, - givenNames: Optional[Array[str]] = None, - honorificPrefix: Optional[str] = None, - honorificSuffix: Optional[str] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, - jobTitle: Optional[str] = None, + givenNames: Optional[Array[String]] = None, + honorificPrefix: Optional[String] = None, + honorificSuffix: Optional[String] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, + jobTitle: Optional[String] = None, memberOf: Optional[Array["Organization"]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, - telephoneNumbers: Optional[Array[str]] = None, - url: Optional[str] = None + meta: Optional[Object] = None, + name: Optional[String] = None, + telephoneNumbers: Optional[Array[String]] = None, + url: Optional[String] = None ) -> None: super().__init__( alternateNames=alternateNames, @@ -2730,44 +2737,44 @@ def __init__( class PostalAddress(ContactPoint): """A physical mailing address.""" - addressCountry: Optional[str] = None + addressCountry: Optional[String] = None """The country.""" - addressLocality: Optional[str] = None + addressLocality: Optional[String] = None """The locality in which the street address is, and which is in the region.""" - addressRegion: Optional[str] = None + addressRegion: Optional[String] = None """The region in which the locality is, and which is in the country.""" - postOfficeBoxNumber: Optional[str] = None + postOfficeBoxNumber: Optional[String] = None """The post office box number.""" - postalCode: Optional[str] = None + postalCode: Optional[String] = None """The postal code.""" - streetAddress: Optional[str] = None + streetAddress: Optional[String] = None """The street address.""" def __init__( self, - addressCountry: Optional[str] = None, - addressLocality: Optional[str] = None, - addressRegion: Optional[str] = None, - alternateNames: Optional[Array[str]] = None, - availableLanguages: Optional[Array[str]] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, - emails: Optional[Array[str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, - postOfficeBoxNumber: Optional[str] = None, - postalCode: Optional[str] = None, - streetAddress: Optional[str] = None, - telephoneNumbers: Optional[Array[str]] = None, - url: Optional[str] = None + addressCountry: Optional[String] = None, + addressLocality: Optional[String] = None, + addressRegion: Optional[String] = None, + alternateNames: Optional[Array[String]] = None, + availableLanguages: Optional[Array[String]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, + emails: Optional[Array[String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, + postOfficeBoxNumber: Optional[String] = None, + postalCode: Optional[String] = None, + streetAddress: Optional[String] = None, + telephoneNumbers: Optional[Array[String]] = None, + url: Optional[String] = None ) -> None: super().__init__( alternateNames=alternateNames, @@ -2805,26 +2812,26 @@ class Product(Thing): brands: Optional[Array["Brand"]] = None """Brands that the product is labelled with.""" - logo: Optional[Union["ImageObject", str]] = None + logo: Optional[Union["ImageObject", String]] = None """The logo of the product.""" - productID: Optional[str] = None + productID: Optional[String] = None """Product identification code.""" def __init__( self, - alternateNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, brands: Optional[Array["Brand"]] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, - logo: Optional[Union["ImageObject", str]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, - productID: Optional[str] = None, - url: Optional[str] = None + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, + logo: Optional[Union["ImageObject", String]] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, + productID: Optional[String] = None, + url: Optional[String] = None ) -> None: super().__init__( alternateNames=alternateNames, @@ -2847,25 +2854,25 @@ def __init__( class PropertyValue(Thing): """A property-value pair.""" - value: Union[bool, int, float, str] + value: Union[Boolean, Integer, Number, String] """The value of the property.""" - propertyID: Optional[str] = None + propertyID: Optional[String] = None """A commonly used identifier for the characteristic represented by the property.""" def __init__( self, - value: Union[bool, int, float, str], - alternateNames: Optional[Array[str]] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, - propertyID: Optional[str] = None, - url: Optional[str] = None + value: Union[Boolean, Integer, Number, String], + alternateNames: Optional[Array[String]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, + propertyID: Optional[String] = None, + url: Optional[String] = None ) -> None: super().__init__( alternateNames=alternateNames, @@ -2889,16 +2896,16 @@ class PublicationIssue(CreativeWork): publication volume, often numbered. """ - issueNumber: Optional[Union[int, str]] = None + issueNumber: Optional[Union[Integer, String]] = None """Identifies the issue of publication; for example, "iii" or "2".""" - pageEnd: Optional[Union[int, str]] = None + pageEnd: Optional[Union[Integer, String]] = None """The page on which the issue ends; for example "138" or "xvi".""" - pageStart: Optional[Union[int, str]] = None + pageStart: Optional[Union[Integer, String]] = None """The page on which the issue starts; for example "135" or "xiii".""" - pagination: Optional[str] = None + pagination: Optional[String] = None """Any description of pages that is not separated into pageStart and pageEnd; for example, "1-6, 9, 55". """ @@ -2907,40 +2914,40 @@ class PublicationIssue(CreativeWork): def __init__( self, about: Optional[Array["ThingTypes"]] = None, - alternateNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, authors: Optional[Array[Union["Person", "Organization"]]] = None, comments: Optional[Array["Comment"]] = None, - content: Optional[Union[Array["Any"], str]] = None, + content: Optional[Union[Array[Any], String]] = None, dateAccepted: Optional["Date"] = None, dateCreated: Optional["Date"] = None, dateModified: Optional["Date"] = None, datePublished: Optional["Date"] = None, dateReceived: Optional["Date"] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, editors: Optional[Array["Person"]] = None, fundedBy: Optional[Array[Union["Grant", "MonetaryGrant"]]] = None, funders: Optional[Array[Union["Person", "Organization"]]] = None, - genre: Optional[Array[str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, + genre: Optional[Array[String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, isPartOf: Optional["CreativeWorkTypes"] = None, - issueNumber: Optional[Union[int, str]] = None, - keywords: Optional[Array[str]] = None, - licenses: Optional[Array[Union["CreativeWorkTypes", str]]] = None, + issueNumber: Optional[Union[Integer, String]] = None, + keywords: Optional[Array[String]] = None, + licenses: Optional[Array[Union["CreativeWorkTypes", String]]] = None, maintainers: Optional[Array[Union["Person", "Organization"]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, - pageEnd: Optional[Union[int, str]] = None, - pageStart: Optional[Union[int, str]] = None, - pagination: Optional[str] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, + pageEnd: Optional[Union[Integer, String]] = None, + pageStart: Optional[Union[Integer, String]] = None, + pagination: Optional[String] = None, parts: Optional[Array["CreativeWorkTypes"]] = None, publisher: Optional[Union["Person", "Organization"]] = None, - references: Optional[Array[Union["CreativeWorkTypes", str]]] = None, - text: Optional[str] = None, - title: Optional[Union[Array["InlineContent"], str]] = None, - url: Optional[str] = None, - version: Optional[Union[str, float]] = None + references: Optional[Array[Union["CreativeWorkTypes", String]]] = None, + text: Optional[String] = None, + title: Optional[Union[Array["InlineContent"], String]] = None, + url: Optional[String] = None, + version: Optional[Union[String, Number]] = None ) -> None: super().__init__( about=about, @@ -2991,18 +2998,18 @@ class PublicationVolume(CreativeWork): multi-volume work. """ - pageEnd: Optional[Union[int, str]] = None + pageEnd: Optional[Union[Integer, String]] = None """The page on which the volume ends; for example "138" or "xvi".""" - pageStart: Optional[Union[int, str]] = None + pageStart: Optional[Union[Integer, String]] = None """The page on which the volume starts; for example "135" or "xiii".""" - pagination: Optional[str] = None + pagination: Optional[String] = None """Any description of pages that is not separated into pageStart and pageEnd; for example, "1-6, 9, 55". """ - volumeNumber: Optional[Union[int, str]] = None + volumeNumber: Optional[Union[Integer, String]] = None """Identifies the volume of publication or multi-part work; for example, "iii" or "2". """ @@ -3010,40 +3017,40 @@ class PublicationVolume(CreativeWork): def __init__( self, about: Optional[Array["ThingTypes"]] = None, - alternateNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, authors: Optional[Array[Union["Person", "Organization"]]] = None, comments: Optional[Array["Comment"]] = None, - content: Optional[Union[Array["Any"], str]] = None, + content: Optional[Union[Array[Any], String]] = None, dateAccepted: Optional["Date"] = None, dateCreated: Optional["Date"] = None, dateModified: Optional["Date"] = None, datePublished: Optional["Date"] = None, dateReceived: Optional["Date"] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, editors: Optional[Array["Person"]] = None, fundedBy: Optional[Array[Union["Grant", "MonetaryGrant"]]] = None, funders: Optional[Array[Union["Person", "Organization"]]] = None, - genre: Optional[Array[str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, + genre: Optional[Array[String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, isPartOf: Optional["CreativeWorkTypes"] = None, - keywords: Optional[Array[str]] = None, - licenses: Optional[Array[Union["CreativeWorkTypes", str]]] = None, + keywords: Optional[Array[String]] = None, + licenses: Optional[Array[Union["CreativeWorkTypes", String]]] = None, maintainers: Optional[Array[Union["Person", "Organization"]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, - pageEnd: Optional[Union[int, str]] = None, - pageStart: Optional[Union[int, str]] = None, - pagination: Optional[str] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, + pageEnd: Optional[Union[Integer, String]] = None, + pageStart: Optional[Union[Integer, String]] = None, + pagination: Optional[String] = None, parts: Optional[Array["CreativeWorkTypes"]] = None, publisher: Optional[Union["Person", "Organization"]] = None, - references: Optional[Array[Union["CreativeWorkTypes", str]]] = None, - text: Optional[str] = None, - title: Optional[Union[Array["InlineContent"], str]] = None, - url: Optional[str] = None, - version: Optional[Union[str, float]] = None, - volumeNumber: Optional[Union[int, str]] = None + references: Optional[Array[Union["CreativeWorkTypes", String]]] = None, + text: Optional[String] = None, + title: Optional[Union[Array["InlineContent"], String]] = None, + url: Optional[String] = None, + version: Optional[Union[String, Number]] = None, + volumeNumber: Optional[Union[Integer, String]] = None ) -> None: super().__init__( about=about, @@ -3091,16 +3098,16 @@ def __init__( class Quote(Mark): """Inline, quoted content.""" - cite: Optional[Union["Cite", str]] = None + cite: Optional[Union["Cite", String]] = None """The source of the quote.""" def __init__( self, content: Array["InlineContent"], - cite: Optional[Union["Cite", str]] = None, - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + cite: Optional[Union["Cite", String]] = None, + id: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( content=content, @@ -3117,16 +3124,16 @@ class QuoteBlock(Entity): content: Array["BlockContent"] """The content of the quote.""" - cite: Optional[Union["Cite", str]] = None + cite: Optional[Union["Cite", String]] = None """The source of the quote.""" def __init__( self, content: Array["BlockContent"], - cite: Optional[Union["Cite", str]] = None, - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + cite: Optional[Union["Cite", String]] = None, + id: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( id=id, @@ -3144,45 +3151,45 @@ class Review(CreativeWork): itemReviewed: Optional["Thing"] = None """The item that is being reviewed.""" - reviewAspect: Optional[str] = None + reviewAspect: Optional[String] = None """The part or facet of the item that is being reviewed.""" def __init__( self, about: Optional[Array["ThingTypes"]] = None, - alternateNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, authors: Optional[Array[Union["Person", "Organization"]]] = None, comments: Optional[Array["Comment"]] = None, - content: Optional[Union[Array["Any"], str]] = None, + content: Optional[Union[Array[Any], String]] = None, dateAccepted: Optional["Date"] = None, dateCreated: Optional["Date"] = None, dateModified: Optional["Date"] = None, datePublished: Optional["Date"] = None, dateReceived: Optional["Date"] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, editors: Optional[Array["Person"]] = None, fundedBy: Optional[Array[Union["Grant", "MonetaryGrant"]]] = None, funders: Optional[Array[Union["Person", "Organization"]]] = None, - genre: Optional[Array[str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, + genre: Optional[Array[String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, isPartOf: Optional["CreativeWorkTypes"] = None, itemReviewed: Optional["Thing"] = None, - keywords: Optional[Array[str]] = None, - licenses: Optional[Array[Union["CreativeWorkTypes", str]]] = None, + keywords: Optional[Array[String]] = None, + licenses: Optional[Array[Union["CreativeWorkTypes", String]]] = None, maintainers: Optional[Array[Union["Person", "Organization"]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, parts: Optional[Array["CreativeWorkTypes"]] = None, publisher: Optional[Union["Person", "Organization"]] = None, - references: Optional[Array[Union["CreativeWorkTypes", str]]] = None, - reviewAspect: Optional[str] = None, - text: Optional[str] = None, - title: Optional[Union[Array["InlineContent"], str]] = None, - url: Optional[str] = None, - version: Optional[Union[str, float]] = None + references: Optional[Array[Union["CreativeWorkTypes", String]]] = None, + reviewAspect: Optional[String] = None, + text: Optional[String] = None, + title: Optional[Union[Array["InlineContent"], String]] = None, + url: Optional[String] = None, + version: Optional[Union[String, Number]] = None ) -> None: super().__init__( about=about, @@ -3231,45 +3238,45 @@ class SoftwareApplication(CreativeWork): are not included in the application distribution. """ - softwareVersion: Optional[str] = None + softwareVersion: Optional[String] = None """Version of the software.""" def __init__( self, about: Optional[Array["ThingTypes"]] = None, - alternateNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, authors: Optional[Array[Union["Person", "Organization"]]] = None, comments: Optional[Array["Comment"]] = None, - content: Optional[Union[Array["Any"], str]] = None, + content: Optional[Union[Array[Any], String]] = None, dateAccepted: Optional["Date"] = None, dateCreated: Optional["Date"] = None, dateModified: Optional["Date"] = None, datePublished: Optional["Date"] = None, dateReceived: Optional["Date"] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, editors: Optional[Array["Person"]] = None, fundedBy: Optional[Array[Union["Grant", "MonetaryGrant"]]] = None, funders: Optional[Array[Union["Person", "Organization"]]] = None, - genre: Optional[Array[str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, + genre: Optional[Array[String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, isPartOf: Optional["CreativeWorkTypes"] = None, - keywords: Optional[Array[str]] = None, - licenses: Optional[Array[Union["CreativeWorkTypes", str]]] = None, + keywords: Optional[Array[String]] = None, + licenses: Optional[Array[Union["CreativeWorkTypes", String]]] = None, maintainers: Optional[Array[Union["Person", "Organization"]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, parts: Optional[Array["CreativeWorkTypes"]] = None, publisher: Optional[Union["Person", "Organization"]] = None, - references: Optional[Array[Union["CreativeWorkTypes", str]]] = None, + references: Optional[Array[Union["CreativeWorkTypes", String]]] = None, softwareRequirements: Optional[Array["SoftwareApplication"]] = None, - softwareVersion: Optional[str] = None, - text: Optional[str] = None, - title: Optional[Union[Array["InlineContent"], str]] = None, - url: Optional[str] = None, - version: Optional[Union[str, float]] = None + softwareVersion: Optional[String] = None, + text: Optional[String] = None, + title: Optional[Union[Array["InlineContent"], String]] = None, + url: Optional[String] = None, + version: Optional[Union[String, Number]] = None ) -> None: super().__init__( about=about, @@ -3313,7 +3320,7 @@ def __init__( class SoftwareEnvironment(Thing): """A computational environment.""" - name: str # type: ignore + name: String # type: ignore """The name of the item.""" adds: Optional[Array["SoftwareSourceCode"]] = None @@ -3328,17 +3335,17 @@ class SoftwareEnvironment(Thing): def __init__( self, - name: str, + name: String, adds: Optional[Array["SoftwareSourceCode"]] = None, - alternateNames: Optional[Array[str]] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + alternateNames: Optional[Array[String]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, extends: Optional[Array["SoftwareEnvironment"]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, - meta: Optional[Dict[str, Any]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, + meta: Optional[Object] = None, removes: Optional[Array["SoftwareSourceCode"]] = None, - url: Optional[str] = None + url: Optional[String] = None ) -> None: super().__init__( name=name, @@ -3366,16 +3373,16 @@ class SoftwareSession(Thing): resource requirements and status. """ - clientsLimit: Optional[float] = None + clientsLimit: Optional[Number] = None """The maximum number of concurrent clients the session is limited to.""" - clientsRequest: Optional[float] = None + clientsRequest: Optional[Number] = None """The maximum number of concurrent clients requested for the session.""" - cpuLimit: Optional[float] = None + cpuLimit: Optional[Number] = None """The amount of CPU the session is limited to.""" - cpuRequest: Optional[float] = None + cpuRequest: Optional[Number] = None """The amount of CPU requested for the session.""" dateEnd: Optional["Date"] = None @@ -3384,34 +3391,34 @@ class SoftwareSession(Thing): dateStart: Optional["Date"] = None """The date-time that the session began.""" - durationLimit: Optional[float] = None + durationLimit: Optional[Number] = None """The maximum duration (seconds) the session is limited to.""" - durationRequest: Optional[float] = None + durationRequest: Optional[Number] = None """The maximum duration (seconds) requested for the session.""" environment: Optional["SoftwareEnvironment"] = None """The software environment to execute this session in.""" - memoryLimit: Optional[float] = None + memoryLimit: Optional[Number] = None """The amount of memory that the session is limited to.""" - memoryRequest: Optional[float] = None + memoryRequest: Optional[Number] = None """The amount of memory requested for the session.""" - networkTransferLimit: Optional[float] = None + networkTransferLimit: Optional[Number] = None """The amount of network data transfer (GiB) that the session is limited to.""" - networkTransferRequest: Optional[float] = None + networkTransferRequest: Optional[Number] = None """The amount of network data transfer (GiB) requested for the session.""" status: Optional["ESessionStatus"] = None """The status of the session (starting, stopped, etc).""" - timeoutLimit: Optional[float] = None + timeoutLimit: Optional[Number] = None """The inactivity timeout (seconds) the session is limited to.""" - timeoutRequest: Optional[float] = None + timeoutRequest: Optional[Number] = None """The inactivity timeout (seconds) requested for the session.""" volumeMounts: Optional[Array["VolumeMount"]] = None @@ -3420,30 +3427,30 @@ class SoftwareSession(Thing): def __init__( self, - alternateNames: Optional[Array[str]] = None, - clientsLimit: Optional[float] = None, - clientsRequest: Optional[float] = None, - cpuLimit: Optional[float] = None, - cpuRequest: Optional[float] = None, + alternateNames: Optional[Array[String]] = None, + clientsLimit: Optional[Number] = None, + clientsRequest: Optional[Number] = None, + cpuLimit: Optional[Number] = None, + cpuRequest: Optional[Number] = None, dateEnd: Optional["Date"] = None, dateStart: Optional["Date"] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, - durationLimit: Optional[float] = None, - durationRequest: Optional[float] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, + durationLimit: Optional[Number] = None, + durationRequest: Optional[Number] = None, environment: Optional["SoftwareEnvironment"] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, - memoryLimit: Optional[float] = None, - memoryRequest: Optional[float] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, - networkTransferLimit: Optional[float] = None, - networkTransferRequest: Optional[float] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, + memoryLimit: Optional[Number] = None, + memoryRequest: Optional[Number] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, + networkTransferLimit: Optional[Number] = None, + networkTransferRequest: Optional[Number] = None, status: Optional["ESessionStatus"] = None, - timeoutLimit: Optional[float] = None, - timeoutRequest: Optional[float] = None, - url: Optional[str] = None, + timeoutLimit: Optional[Number] = None, + timeoutRequest: Optional[Number] = None, + url: Optional[String] = None, volumeMounts: Optional[Array["VolumeMount"]] = None ) -> None: super().__init__( @@ -3498,25 +3505,25 @@ class SoftwareSourceCode(CreativeWork): code snippet samples, scripts, templates. """ - codeRepository: Optional[str] = None + codeRepository: Optional[String] = None """Link to the repository where the un-compiled, human readable code and related code is located. """ - codeSampleType: Optional[str] = None + codeSampleType: Optional[String] = None """What type of code sample: full (compile ready) solution, code snippet, inline code, scripts, template. """ - programmingLanguage: Optional[str] = None + programmingLanguage: Optional[String] = None """The computer programming language. """ - runtimePlatform: Optional[Array[str]] = None + runtimePlatform: Optional[Array[String]] = None """Runtime platform or script interpreter dependencies (Example - Java v1, Python2.3, .Net Framework 3.0). """ - softwareRequirements: Optional[Array[Union["SoftwareSourceCode", "SoftwareApplication", str]]] = None + softwareRequirements: Optional[Array[Union["SoftwareSourceCode", "SoftwareApplication", String]]] = None """Dependency requirements for the software.""" targetProducts: Optional[Array["SoftwareApplication"]] = None @@ -3527,42 +3534,42 @@ class SoftwareSourceCode(CreativeWork): def __init__( self, about: Optional[Array["ThingTypes"]] = None, - alternateNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, authors: Optional[Array[Union["Person", "Organization"]]] = None, - codeRepository: Optional[str] = None, - codeSampleType: Optional[str] = None, + codeRepository: Optional[String] = None, + codeSampleType: Optional[String] = None, comments: Optional[Array["Comment"]] = None, - content: Optional[Union[Array["Any"], str]] = None, + content: Optional[Union[Array[Any], String]] = None, dateAccepted: Optional["Date"] = None, dateCreated: Optional["Date"] = None, dateModified: Optional["Date"] = None, datePublished: Optional["Date"] = None, dateReceived: Optional["Date"] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, editors: Optional[Array["Person"]] = None, fundedBy: Optional[Array[Union["Grant", "MonetaryGrant"]]] = None, funders: Optional[Array[Union["Person", "Organization"]]] = None, - genre: Optional[Array[str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, + genre: Optional[Array[String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, isPartOf: Optional["CreativeWorkTypes"] = None, - keywords: Optional[Array[str]] = None, - licenses: Optional[Array[Union["CreativeWorkTypes", str]]] = None, + keywords: Optional[Array[String]] = None, + licenses: Optional[Array[Union["CreativeWorkTypes", String]]] = None, maintainers: Optional[Array[Union["Person", "Organization"]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, parts: Optional[Array["CreativeWorkTypes"]] = None, - programmingLanguage: Optional[str] = None, + programmingLanguage: Optional[String] = None, publisher: Optional[Union["Person", "Organization"]] = None, - references: Optional[Array[Union["CreativeWorkTypes", str]]] = None, - runtimePlatform: Optional[Array[str]] = None, - softwareRequirements: Optional[Array[Union["SoftwareSourceCode", "SoftwareApplication", str]]] = None, + references: Optional[Array[Union["CreativeWorkTypes", String]]] = None, + runtimePlatform: Optional[Array[String]] = None, + softwareRequirements: Optional[Array[Union["SoftwareSourceCode", "SoftwareApplication", String]]] = None, targetProducts: Optional[Array["SoftwareApplication"]] = None, - text: Optional[str] = None, - title: Optional[Union[Array["InlineContent"], str]] = None, - url: Optional[str] = None, - version: Optional[Union[str, float]] = None + text: Optional[String] = None, + title: Optional[Union[Array["InlineContent"], String]] = None, + url: Optional[String] = None, + version: Optional[Union[String, Number]] = None ) -> None: super().__init__( about=about, @@ -3614,23 +3621,23 @@ def __init__( class StringValidator(Validator): """A schema specifying constraints on a string node.""" - maxLength: Optional[int] = None + maxLength: Optional[Integer] = None """The maximum length for a string node.""" - minLength: Optional[int] = None + minLength: Optional[Integer] = None """The minimum length for a string node.""" - pattern: Optional[str] = None + pattern: Optional[String] = None """A regular expression that a string node must match.""" def __init__( self, - id: Optional[str] = None, - maxLength: Optional[int] = None, - meta: Optional[Dict[str, Any]] = None, - minLength: Optional[int] = None, - pattern: Optional[str] = None + id: Optional[String] = None, + maxLength: Optional[Integer] = None, + meta: Optional[Object] = None, + minLength: Optional[Integer] = None, + pattern: Optional[String] = None ) -> None: super().__init__( id=id, @@ -3650,8 +3657,8 @@ class Strong(Mark): def __init__( self, content: Array["InlineContent"], - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + id: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( content=content, @@ -3667,8 +3674,8 @@ class Subscript(Mark): def __init__( self, content: Array["InlineContent"], - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + id: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( content=content, @@ -3684,8 +3691,8 @@ class Superscript(Mark): def __init__( self, content: Array["InlineContent"], - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + id: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( content=content, @@ -3702,10 +3709,10 @@ class Table(CreativeWork): """Rows of cells in the table. """ - caption: Optional[Union[Array["BlockContent"], str]] = None + caption: Optional[Union[Array["BlockContent"], String]] = None """A caption for the table.""" - label: Optional[str] = None + label: Optional[String] = None """A short label for the table.""" @@ -3713,38 +3720,38 @@ def __init__( self, rows: Array["TableRow"], about: Optional[Array["ThingTypes"]] = None, - alternateNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, authors: Optional[Array[Union["Person", "Organization"]]] = None, - caption: Optional[Union[Array["BlockContent"], str]] = None, + caption: Optional[Union[Array["BlockContent"], String]] = None, comments: Optional[Array["Comment"]] = None, - content: Optional[Union[Array["Any"], str]] = None, + content: Optional[Union[Array[Any], String]] = None, dateAccepted: Optional["Date"] = None, dateCreated: Optional["Date"] = None, dateModified: Optional["Date"] = None, datePublished: Optional["Date"] = None, dateReceived: Optional["Date"] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, editors: Optional[Array["Person"]] = None, fundedBy: Optional[Array[Union["Grant", "MonetaryGrant"]]] = None, funders: Optional[Array[Union["Person", "Organization"]]] = None, - genre: Optional[Array[str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, + genre: Optional[Array[String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, isPartOf: Optional["CreativeWorkTypes"] = None, - keywords: Optional[Array[str]] = None, - label: Optional[str] = None, - licenses: Optional[Array[Union["CreativeWorkTypes", str]]] = None, + keywords: Optional[Array[String]] = None, + label: Optional[String] = None, + licenses: Optional[Array[Union["CreativeWorkTypes", String]]] = None, maintainers: Optional[Array[Union["Person", "Organization"]]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, parts: Optional[Array["CreativeWorkTypes"]] = None, publisher: Optional[Union["Person", "Organization"]] = None, - references: Optional[Array[Union["CreativeWorkTypes", str]]] = None, - text: Optional[str] = None, - title: Optional[Union[Array["InlineContent"], str]] = None, - url: Optional[str] = None, - version: Optional[Union[str, float]] = None + references: Optional[Array[Union["CreativeWorkTypes", String]]] = None, + text: Optional[String] = None, + title: Optional[Union[Array["InlineContent"], String]] = None, + url: Optional[String] = None, + version: Optional[Union[String, Number]] = None ) -> None: super().__init__( about=about, @@ -3793,29 +3800,29 @@ class TableCell(Entity): cellType: Optional["ECellType"] = None """Indicates whether the cell is a header or data.""" - colspan: Optional[int] = None + colspan: Optional[Integer] = None """How many columns the cell extends. """ content: Optional[Union[Array["BlockContent"], Array["InlineContent"]]] = None """Contents of the table cell.""" - name: Optional[str] = None + name: Optional[String] = None """The name of the cell.""" - rowspan: Optional[int] = None + rowspan: Optional[Integer] = None """How many columns the cell extends.""" def __init__( self, cellType: Optional["ECellType"] = None, - colspan: Optional[int] = None, + colspan: Optional[Integer] = None, content: Optional[Union[Array["BlockContent"], Array["InlineContent"]]] = None, - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, - rowspan: Optional[int] = None + id: Optional[String] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, + rowspan: Optional[Integer] = None ) -> None: super().__init__( id=id, @@ -3847,8 +3854,8 @@ class TableRow(Entity): def __init__( self, cells: Array["TableCell"], - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, + id: Optional[String] = None, + meta: Optional[Object] = None, rowType: Optional["ERowType"] = None ) -> None: super().__init__( @@ -3869,8 +3876,8 @@ class ThematicBreak(Entity): def __init__( self, - id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None + id: Optional[String] = None, + meta: Optional[Object] = None ) -> None: super().__init__( id=id, @@ -3890,9 +3897,9 @@ class TupleValidator(Validator): def __init__( self, - id: Optional[str] = None, + id: Optional[String] = None, items: Optional[Array["ValidatorTypes"]] = None, - meta: Optional[Dict[str, Any]] = None + meta: Optional[Object] = None ) -> None: super().__init__( id=id, @@ -3905,57 +3912,57 @@ def __init__( class VideoObject(MediaObject): """A video file.""" - caption: Optional[str] = None + caption: Optional[String] = None """The caption for this video recording.""" thumbnail: Optional["ImageObject"] = None """Thumbnail image of this video recording.""" - transcript: Optional[str] = None + transcript: Optional[String] = None """The transcript of this video recording.""" def __init__( self, - contentUrl: str, + contentUrl: String, about: Optional[Array["ThingTypes"]] = None, - alternateNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, authors: Optional[Array[Union["Person", "Organization"]]] = None, - bitrate: Optional[float] = None, - caption: Optional[str] = None, + bitrate: Optional[Number] = None, + caption: Optional[String] = None, comments: Optional[Array["Comment"]] = None, - content: Optional[Union[Array["Any"], str]] = None, - contentSize: Optional[float] = None, + content: Optional[Union[Array[Any], String]] = None, + contentSize: Optional[Number] = None, dateAccepted: Optional["Date"] = None, dateCreated: Optional["Date"] = None, dateModified: Optional["Date"] = None, datePublished: Optional["Date"] = None, dateReceived: Optional["Date"] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, editors: Optional[Array["Person"]] = None, - embedUrl: Optional[str] = None, + embedUrl: Optional[String] = None, fundedBy: Optional[Array[Union["Grant", "MonetaryGrant"]]] = None, funders: Optional[Array[Union["Person", "Organization"]]] = None, - genre: Optional[Array[str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, + genre: Optional[Array[String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, isPartOf: Optional["CreativeWorkTypes"] = None, - keywords: Optional[Array[str]] = None, - licenses: Optional[Array[Union["CreativeWorkTypes", str]]] = None, + keywords: Optional[Array[String]] = None, + licenses: Optional[Array[Union["CreativeWorkTypes", String]]] = None, maintainers: Optional[Array[Union["Person", "Organization"]]] = None, - mediaType: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, + mediaType: Optional[String] = None, + meta: Optional[Object] = None, + name: Optional[String] = None, parts: Optional[Array["CreativeWorkTypes"]] = None, publisher: Optional[Union["Person", "Organization"]] = None, - references: Optional[Array[Union["CreativeWorkTypes", str]]] = None, - text: Optional[str] = None, + references: Optional[Array[Union["CreativeWorkTypes", String]]] = None, + text: Optional[String] = None, thumbnail: Optional["ImageObject"] = None, - title: Optional[Union[Array["InlineContent"], str]] = None, - transcript: Optional[str] = None, - url: Optional[str] = None, - version: Optional[Union[str, float]] = None + title: Optional[Union[Array["InlineContent"], String]] = None, + transcript: Optional[String] = None, + url: Optional[String] = None, + version: Optional[Union[String, Number]] = None ) -> None: super().__init__( contentUrl=contentUrl, @@ -4006,33 +4013,33 @@ def __init__( class VolumeMount(Thing): """Describes a volume mount from a host to container.""" - mountDestination: str + mountDestination: String """The mount location inside the container.""" - mountOptions: Optional[Array[str]] = None + mountOptions: Optional[Array[String]] = None """A list of options to use when applying the mount.""" - mountSource: Optional[str] = None + mountSource: Optional[String] = None """The mount source directory on the host.""" - mountType: Optional[str] = None + mountType: Optional[String] = None """The type of mount.""" def __init__( self, - mountDestination: str, - alternateNames: Optional[Array[str]] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, - meta: Optional[Dict[str, Any]] = None, - mountOptions: Optional[Array[str]] = None, - mountSource: Optional[str] = None, - mountType: Optional[str] = None, - name: Optional[str] = None, - url: Optional[str] = None + mountDestination: String, + alternateNames: Optional[Array[String]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, + meta: Optional[Object] = None, + mountOptions: Optional[Array[String]] = None, + mountSource: Optional[String] = None, + mountType: Optional[String] = None, + name: Optional[String] = None, + url: Optional[String] = None ) -> None: super().__init__( alternateNames=alternateNames, @@ -4390,7 +4397,7 @@ class CitationIntentEnumeration(Enum): """ Union type for valid inline content. """ -InlineContent = Union["AudioObject", "Cite", "CiteGroup", "CodeExpression", "CodeFragment", "Delete", "Emphasis", "ImageObject", "Link", "MathFragment", "NontextualAnnotation", "Note", "Quote", "Strong", "Subscript", "Superscript", "VideoObject", None, bool, int, float, str] +InlineContent = Union["AudioObject", "Cite", "CiteGroup", "CodeExpression", "CodeFragment", "Delete", "Emphasis", "ImageObject", "Link", "MathFragment", "NontextualAnnotation", "Note", "Quote", "Strong", "Subscript", "Superscript", "VideoObject", None, "Boolean", "Integer", "Number", "String"] """ @@ -4414,7 +4421,7 @@ class CitationIntentEnumeration(Enum): """ Union type for all schema nodes, including primitives and entities """ -Node = Union["Entity", "ArrayValidator", "Article", "AudioObject", "BooleanValidator", "Brand", "CitationIntentEnumeration", "Cite", "CiteGroup", "Claim", "Code", "CodeBlock", "CodeChunk", "CodeError", "CodeExpression", "CodeFragment", "Collection", "Comment", "ConstantValidator", "ContactPoint", "CreativeWork", "Datatable", "DatatableColumn", "Date", "DefinedTerm", "Delete", "Emphasis", "EnumValidator", "Enumeration", "Figure", "Function", "Grant", "Heading", "ImageObject", "Include", "IntegerValidator", "Link", "List", "ListItem", "Mark", "Math", "MathBlock", "MathFragment", "MediaObject", "MonetaryGrant", "NontextualAnnotation", "Note", "NumberValidator", "Organization", "Paragraph", "Parameter", "Periodical", "Person", "PostalAddress", "Product", "PropertyValue", "PublicationIssue", "PublicationVolume", "Quote", "QuoteBlock", "Review", "SoftwareApplication", "SoftwareEnvironment", "SoftwareSession", "SoftwareSourceCode", "StringValidator", "Strong", "Subscript", "Superscript", "Table", "TableCell", "TableRow", "ThematicBreak", "Thing", "TupleValidator", "Validator", "Variable", "VideoObject", "VolumeMount", None, bool, int, float, str, Dict[str, Any], Array["Any"]] +Node = Union["Entity", "ArrayValidator", "Article", "AudioObject", "BooleanValidator", "Brand", "CitationIntentEnumeration", "Cite", "CiteGroup", "Claim", "Code", "CodeBlock", "CodeChunk", "CodeError", "CodeExpression", "CodeFragment", "Collection", "Comment", "ConstantValidator", "ContactPoint", "CreativeWork", "Datatable", "DatatableColumn", "Date", "DefinedTerm", "Delete", "Emphasis", "EnumValidator", "Enumeration", "Figure", "Function", "Grant", "Heading", "ImageObject", "Include", "IntegerValidator", "Link", "List", "ListItem", "Mark", "Math", "MathBlock", "MathFragment", "MediaObject", "MonetaryGrant", "NontextualAnnotation", "Note", "NumberValidator", "Organization", "Paragraph", "Parameter", "Periodical", "Person", "PostalAddress", "Product", "PropertyValue", "PublicationIssue", "PublicationVolume", "Quote", "QuoteBlock", "Review", "SoftwareApplication", "SoftwareEnvironment", "SoftwareSession", "SoftwareSourceCode", "StringValidator", "Strong", "Subscript", "Superscript", "Table", "TableCell", "TableRow", "ThematicBreak", "Thing", "TupleValidator", "Validator", "Variable", "VideoObject", "VolumeMount", None, "Boolean", "Integer", "Number", "String", "Object", "Array"] """ diff --git a/r/R/types.R b/r/R/types.R index e358a79776..d46fd4804d 100644 --- a/r/R/types.R +++ b/r/R/types.R @@ -4512,7 +4512,7 @@ MediaObjectTypes <- Union(MediaObject, AudioObject, ImageObject, VideoObject) #' #' @return A `list` of class `Union` describing valid subtypes of this type #' @export -Node <- Union(Entity, ArrayValidator, Article, AudioObject, BooleanValidator, Brand, CitationIntentEnumeration, Cite, CiteGroup, Claim, Code, CodeBlock, CodeChunk, CodeError, CodeExpression, CodeFragment, Collection, Comment, ConstantValidator, ContactPoint, CreativeWork, Datatable, DatatableColumn, Date, DefinedTerm, Delete, Emphasis, EnumValidator, Enumeration, Figure, Function, Grant, Heading, ImageObject, Include, IntegerValidator, Link, List, ListItem, Mark, Math, MathBlock, MathFragment, MediaObject, MonetaryGrant, NontextualAnnotation, Note, NumberValidator, Organization, Paragraph, Parameter, Periodical, Person, PostalAddress, Product, PropertyValue, PublicationIssue, PublicationVolume, Quote, QuoteBlock, Review, SoftwareApplication, SoftwareEnvironment, SoftwareSession, SoftwareSourceCode, StringValidator, Strong, Subscript, Superscript, Table, TableCell, TableRow, ThematicBreak, Thing, TupleValidator, Validator, Variable, VideoObject, VolumeMount, "NULL", "logical", "numeric", "character", "list", Array("Node")) +Node <- Union(Entity, ArrayValidator, Article, AudioObject, BooleanValidator, Brand, CitationIntentEnumeration, Cite, CiteGroup, Claim, Code, CodeBlock, CodeChunk, CodeError, CodeExpression, CodeFragment, Collection, Comment, ConstantValidator, ContactPoint, CreativeWork, Datatable, DatatableColumn, Date, DefinedTerm, Delete, Emphasis, EnumValidator, Enumeration, Figure, Function, Grant, Heading, ImageObject, Include, IntegerValidator, Link, List, ListItem, Mark, Math, MathBlock, MathFragment, MediaObject, MonetaryGrant, NontextualAnnotation, Note, NumberValidator, Organization, Paragraph, Parameter, Periodical, Person, PostalAddress, Product, PropertyValue, PublicationIssue, PublicationVolume, Quote, QuoteBlock, Review, SoftwareApplication, SoftwareEnvironment, SoftwareSession, SoftwareSourceCode, StringValidator, Strong, Subscript, Superscript, Table, TableCell, TableRow, ThematicBreak, Thing, TupleValidator, Validator, Variable, VideoObject, VolumeMount, "NULL", "logical", "numeric", "character", "list", Array(Any())) #' All type schemas that are derived from Thing diff --git a/rust/src/schemas.rs b/rust/src/schemas.rs index 17acdfd70f..a3d09d4f1a 100644 --- a/rust/src/schemas.rs +++ b/rust/src/schemas.rs @@ -46,7 +46,7 @@ pub const SCHEMAS: &[(&str, &str)] = &[ ("Heading", r#"{"title":"Heading","required":["type","content"],"examples":[{"type":"Heading","depth":2,"content":["Secondary Heading"]}],"type":"object","additionalProperties":false,"propertyAliases":{},"properties":{"id":{"type":"string"},"depth":{"type":"integer","default":1,"minimum":1,"maximum":6},"content":{"type":"array","items":{"$ref":"InlineContent.schema.json"}}}}"#), ("ImageObject", r#"{"title":"ImageObject","examples":[{"type":"ImageObject","caption":"Kiwi","contentSize":"10.4","contentUrl":"http://www.example.com/kiwi.png","encodingFormat":"image/png","thumbnail":{"type":"ImageObject","contentUrl":"http://www.example.com/kiwi_mini.png"}}],"type":"object","additionalProperties":false,"required":["type","contentUrl"],"propertyAliases":{"alternateName":"alternateNames","identifier":"identifiers","image":"images","author":"authors","comment":"comments","date":"datePublished","editor":"editors","funder":"funders","keyword":"keywords","license":"licenses","maintainer":"maintainers","hasParts":"parts","part":"parts","citations":"references","reference":"references","headline":"title","encodingFormat":"mediaType"},"properties":{"id":{"type":"string"},"alternateNames":{"type":"array","items":{"type":"string"},"aliases":["alternateName"]},"description":{"anyOf":[{"type":"array","items":{"$ref":"BlockContent.schema.json"}},{"type":"array","items":{"$ref":"InlineContent.schema.json"},"minItems":2},{"type":"string"}]},"identifiers":{"type":"array","items":{"anyOf":[{"$ref":"PropertyValue.schema.json"},{"type":"string"}]},"aliases":["identifier"]},"images":{"type":"array","items":{"anyOf":[{"$ref":"ImageObject.schema.json"},{"type":"string","format":"uri"}]},"aliases":["image"]},"name":{"type":"string"},"url":{"type":"string","format":"uri"},"about":{"type":"array","items":{"$ref":"ThingTypes.schema.json"}},"authors":{"allOf":[{"parser":"scsi"},{"type":"array","items":{"anyOf":[{"$ref":"Person.schema.json"},{"$ref":"Organization.schema.json"}]}}],"aliases":["author"]},"comments":{"type":"array","items":{"$ref":"Comment.schema.json"},"aliases":["comment"]},"content":{"anyOf":[{"type":"array","items":{"$ref":"Node.schema.json"}},{"type":"string"}]},"dateCreated":{"allOf":[{"$ref":"Date.schema.json"}]},"dateReceived":{"allOf":[{"$ref":"Date.schema.json"}]},"dateAccepted":{"allOf":[{"$ref":"Date.schema.json"}]},"dateModified":{"allOf":[{"$ref":"Date.schema.json"}]},"datePublished":{"aliases":["date"],"allOf":[{"$ref":"Date.schema.json"}]},"editors":{"type":"array","items":{"$ref":"Person.schema.json"},"aliases":["editor"]},"funders":{"type":"array","items":{"anyOf":[{"$ref":"Person.schema.json"},{"$ref":"Organization.schema.json"}]},"aliases":["funder"]},"fundedBy":{"type":"array","items":{"anyOf":[{"$ref":"Grant.schema.json"},{"$ref":"MonetaryGrant.schema.json"}]}},"genre":{"allOf":[{"parser":"csi"},{"type":"array","items":{"type":"string"}}]},"keywords":{"allOf":[{"parser":"csi"},{"type":"array","items":{"type":"string"}}],"aliases":["keyword"]},"isPartOf":{"$ref":"CreativeWorkTypes.schema.json"},"licenses":{"type":"array","items":{"anyOf":[{"$ref":"CreativeWorkTypes.schema.json"},{"type":"string","format":"uri"}]},"aliases":["license"]},"maintainers":{"type":"array","items":{"anyOf":[{"$ref":"Person.schema.json"},{"$ref":"Organization.schema.json"}]},"aliases":["maintainer"]},"parts":{"aliases":["hasParts","part"],"type":"array","items":{"$ref":"CreativeWorkTypes.schema.json"}},"publisher":{"anyOf":[{"$ref":"Person.schema.json"},{"$ref":"Organization.schema.json"}]},"references":{"aliases":["citations","reference"],"type":"array","items":{"anyOf":[{"$ref":"CreativeWorkTypes.schema.json"},{"type":"string"}]}},"text":{"type":"string"},"title":{"aliases":["headline"],"anyOf":[{"type":"array","items":{"$ref":"InlineContent.schema.json"},"minItems":2},{"type":"string"}]},"version":{"anyOf":[{"type":"string"},{"type":"number"}]},"bitrate":{"type":"number"},"contentSize":{"type":"number"},"contentUrl":{"type":"string"},"embedUrl":{"type":"string"},"mediaType":{"aliases":["encodingFormat"],"type":"string","pattern":"^[a-z]+(\\/[a-z\\+\\-]+)$"},"caption":{"type":"string"},"thumbnail":{"allOf":[{"$ref":"ImageObject.schema.json"}]}}}"#), ("Include", r#"{"title":"Include","required":["type","source"],"type":"object","propertyAliases":{"encodingFormat":"mediaType"},"additionalProperties":false,"properties":{"id":{"type":"string"},"source":{"type":"string"},"mediaType":{"aliases":["encodingFormat"],"type":"string"},"content":{"type":"array","items":{"$ref":"BlockContent.schema.json"}}}}"#), - ("InlineContent", r#"{"title":"InlineContent","anyOf":[{"$ref":"AudioObject.schema.json"},{"$ref":"Cite.schema.json"},{"$ref":"CiteGroup.schema.json"},{"$ref":"CodeExpression.schema.json"},{"$ref":"CodeFragment.schema.json"},{"$ref":"Delete.schema.json"},{"$ref":"Emphasis.schema.json"},{"$ref":"ImageObject.schema.json"},{"$ref":"Link.schema.json"},{"$ref":"MathFragment.schema.json"},{"$ref":"NontextualAnnotation.schema.json"},{"$ref":"Note.schema.json"},{"$ref":"Quote.schema.json"},{"$ref":"Strong.schema.json"},{"$ref":"Subscript.schema.json"},{"$ref":"Superscript.schema.json"},{"$ref":"VideoObject.schema.json"},{"type":"null"},{"type":"boolean"},{"type":"integer"},{"type":"number"},{"type":"string"}]}"#), + ("InlineContent", r#"{"title":"InlineContent","anyOf":[{"$ref":"AudioObject.schema.json"},{"$ref":"Cite.schema.json"},{"$ref":"CiteGroup.schema.json"},{"$ref":"CodeExpression.schema.json"},{"$ref":"CodeFragment.schema.json"},{"$ref":"Delete.schema.json"},{"$ref":"Emphasis.schema.json"},{"$ref":"ImageObject.schema.json"},{"$ref":"Link.schema.json"},{"$ref":"MathFragment.schema.json"},{"$ref":"NontextualAnnotation.schema.json"},{"$ref":"Note.schema.json"},{"$ref":"Quote.schema.json"},{"$ref":"Strong.schema.json"},{"$ref":"Subscript.schema.json"},{"$ref":"Superscript.schema.json"},{"$ref":"VideoObject.schema.json"},{"$ref":"Null.schema.json"},{"$ref":"Boolean.schema.json"},{"$ref":"Integer.schema.json"},{"$ref":"Number.schema.json"},{"$ref":"String.schema.json"}]}"#), ("Integer", r#"{"title":"Integer","type":"integer"}"#), ("IntegerValidator", r#"{"title":"IntegerValidator","type":"object","additionalProperties":false,"required":["type"],"propertyAliases":{},"properties":{"id":{"type":"string"}}}"#), ("Link", r#"{"title":"Link","required":["type","content","target"],"examples":[{"type":"Link","content":["Stencila’s website"],"target":"https://stenci.la"}],"type":"object","propertyAliases":{"export":"exportFrom","import":"importTo"},"additionalProperties":false,"properties":{"id":{"type":"string"},"content":{"type":"array","items":{"$ref":"InlineContent.schema.json"}},"exportFrom":{"aliases":["export"],"type":"string"},"importTo":{"aliases":["import"],"type":"string"},"target":{"type":"string","format":"uri-reference"},"title":{"type":"string"},"relation":{"type":"string"}}}"#), diff --git a/rust/src/types.rs b/rust/src/types.rs index 38f9c71260..5f4fe00fde 100644 --- a/rust/src/types.rs +++ b/rust/src/types.rs @@ -5484,7 +5484,7 @@ pub enum Node { Number(Number), String(String), Object(Object), - Array(Vec), + Array(Array), } /// All type schemas that are derived from Thing diff --git a/schema/Array.schema.yaml b/schema/Array.schema.yaml index 7ab9814e05..0dee057eff 100644 --- a/schema/Array.schema.yaml +++ b/schema/Array.schema.yaml @@ -4,5 +4,3 @@ category: data status: stable description: A value comprised of several other values. type: array -items: - $ref: Node diff --git a/schema/InlineContent.schema.yaml b/schema/InlineContent.schema.yaml index 483d1f3eb0..943712c88f 100644 --- a/schema/InlineContent.schema.yaml +++ b/schema/InlineContent.schema.yaml @@ -26,8 +26,8 @@ anyOf: - $ref: VideoObject # Primitive types in the order that coercion from # string should be attempted (for example by Ajv, or by serde_json). - - type: 'null' - - type: boolean - - type: integer - - type: number - - type: string + - $ref: 'Null' + - $ref: Boolean + - $ref: Integer + - $ref: Number + - $ref: String diff --git a/schema/Integer.schema.yaml b/schema/Integer.schema.yaml new file mode 100644 index 0000000000..ca37b41b27 --- /dev/null +++ b/schema/Integer.schema.yaml @@ -0,0 +1,6 @@ +title: Integer +'@id': schema:Integer +category: data +status: stable +description: A value that is a integer +type: integer diff --git a/schema/Node.schema.yaml b/schema/Node.schema.yaml index 9dd70b129f..cf8a3c3b7e 100644 --- a/schema/Node.schema.yaml +++ b/schema/Node.schema.yaml @@ -9,12 +9,10 @@ $comment: | Array should come last to avoid single items (e.g. a single string) being coerced into an array. anyOf: - - type: 'null' - - type: boolean - - type: integer - - type: number - - type: string - - type: object - - type: array - items: - $ref: Node + - $ref: 'Null' + - $ref: Boolean + - $ref: Integer + - $ref: Number + - $ref: String + - $ref: Object + - $ref: Array diff --git a/ts/bindings/__file_snapshots__/Person.py b/ts/bindings/__file_snapshots__/Person.py index e54811eb54..915edf1f7e 100644 --- a/ts/bindings/__file_snapshots__/Person.py +++ b/ts/bindings/__file_snapshots__/Person.py @@ -1,16 +1,16 @@ class Person(Thing): """A person (alive, dead, undead, or fictional).""" - address: Optional[Union["PostalAddress", str]] = None + address: Optional[Union["PostalAddress", String]] = None """Postal address for the person.""" affiliations: Optional[Array["Organization"]] = None """Organizations that the person is affiliated with.""" - emails: Optional[Array[str]] = None + emails: Optional[Array[String]] = None """Email addresses for the person.""" - familyNames: Optional[Array[str]] = None + familyNames: Optional[Array[String]] = None """Family name. In the U.S., the last name of a person.""" funders: Optional[Array[Union["Organization", "Person"]]] = None @@ -18,46 +18,46 @@ class Person(Thing): some kind of financial contribution. """ - givenNames: Optional[Array[str]] = None + givenNames: Optional[Array[String]] = None """Given name. In the U.S., the first name of a person.""" - honorificPrefix: Optional[str] = None + honorificPrefix: Optional[String] = None """An honorific prefix preceding a person's name such as Dr/Mrs/Mr.""" - honorificSuffix: Optional[str] = None + honorificSuffix: Optional[String] = None """An honorific suffix after a person's name such as MD/PhD/MSCSW.""" - jobTitle: Optional[str] = None + jobTitle: Optional[String] = None """The job title of the person (for example, Financial Manager).""" memberOf: Optional[Array["Organization"]] = None """An organization (or program membership) to which this person belongs.""" - telephoneNumbers: Optional[Array[str]] = None + telephoneNumbers: Optional[Array[String]] = None """Telephone numbers for the person.""" def __init__( self, - address: Optional[Union["PostalAddress", str]] = None, + address: Optional[Union["PostalAddress", String]] = None, affiliations: Optional[Array["Organization"]] = None, - alternateNames: Optional[Array[str]] = None, - description: Optional[Union[Array["BlockContent"], Array["InlineContent"], str]] = None, - emails: Optional[Array[str]] = None, - familyNames: Optional[Array[str]] = None, + alternateNames: Optional[Array[String]] = None, + description: Optional[Union[Array["BlockContent"], Array["InlineContent"], String]] = None, + emails: Optional[Array[String]] = None, + familyNames: Optional[Array[String]] = None, funders: Optional[Array[Union["Organization", "Person"]]] = None, - givenNames: Optional[Array[str]] = None, - honorificPrefix: Optional[str] = None, - honorificSuffix: Optional[str] = None, - id: Optional[str] = None, - identifiers: Optional[Array[Union["PropertyValue", str]]] = None, - images: Optional[Array[Union["ImageObject", str]]] = None, - jobTitle: Optional[str] = None, + givenNames: Optional[Array[String]] = None, + honorificPrefix: Optional[String] = None, + honorificSuffix: Optional[String] = None, + id: Optional[String] = None, + identifiers: Optional[Array[Union["PropertyValue", String]]] = None, + images: Optional[Array[Union["ImageObject", String]]] = None, + jobTitle: Optional[String] = None, memberOf: Optional[Array["Organization"]] = None, - meta: Optional[Dict[str, Any]] = None, - name: Optional[str] = None, - telephoneNumbers: Optional[Array[str]] = None, - url: Optional[str] = None + meta: Optional[Object] = None, + name: Optional[String] = None, + telephoneNumbers: Optional[Array[String]] = None, + url: Optional[String] = None ) -> None: super().__init__( alternateNames=alternateNames, diff --git a/ts/bindings/python.ts b/ts/bindings/python.ts index 4be4bf6182..c86519c655 100644 --- a/ts/bindings/python.ts +++ b/ts/bindings/python.ts @@ -61,6 +61,13 @@ async function build(): Promise { from typing import Any, Dict, List as Array, Optional, Union from enum import Enum +Null = None +Boolean = bool +Number = float +Integer = int +String = str +Object = Dict[str, Any] + ${globalsCode} ${classesCode} @@ -223,20 +230,22 @@ function schemaToType(schema: JsonSchema): string { if ($ref !== undefined) { const title = $ref.replace('.schema.json', '') - return `"${title === 'Node' ? 'Any' : title}"` + if (title === 'Null') return 'None' + else if (title === 'Node') return 'Any' + else return `"${title}"` } if (anyOf !== undefined) return anyOfToType(anyOf) if (allOf !== undefined) return allOfToType(allOf) if (schema.enum !== undefined) return enumToType(schema['@id'], schema.enum) - if (type === 'null') return 'None' - if (type === 'boolean') return 'bool' - if (type === 'number') return 'float' - if (type === 'integer') return 'int' - if (type === 'string') return 'str' + if (type === 'null') return 'Null' + if (type === 'boolean') return 'Boolean' + if (type === 'number') return 'Number' + if (type === 'integer') return 'Integer' + if (type === 'string') return 'String' if (type === 'array') return arrayToType(schema) - if (type === 'object') return 'Dict[str, Any]' + if (type === 'object') return 'Object' throw new Error(`Unhandled schema: ${JSON.stringify(schema)}`) } diff --git a/ts/bindings/r.ts b/ts/bindings/r.ts index 158de888f5..c54afba5cf 100644 --- a/ts/bindings/r.ts +++ b/ts/bindings/r.ts @@ -3,6 +3,7 @@ */ import fs from 'fs-extra' +import { JSONSchema7TypeName } from 'json-schema' import path from 'path' import { JsonSchema } from '../JsonSchema' import { @@ -159,9 +160,26 @@ function docComment(description: string, tags: string[] = []): string { * Convert a schema definition to a R class */ function schemaToType(schema: JsonSchema): string { - const { type, anyOf, allOf, $ref } = schema + let { type, anyOf, allOf, $ref } = schema - if ($ref !== undefined) return `${$ref.replace('.schema.json', '')}` + if ($ref !== undefined) { + const name = $ref.replace('.schema.json', '') + if ( + [ + 'Null', + 'Boolean', + 'Integer', + 'Number', + 'String', + 'Array', + 'Object', + ].includes(name) + ) { + type = name.toLowerCase() as JSONSchema7TypeName + } else { + return `${name}` + } + } if (anyOf !== undefined) return anyOfToType(anyOf) if (allOf !== undefined) return allOfToType(allOf) if (schema.enum !== undefined) return enumToType(schema.enum) diff --git a/ts/bindings/rust.ts b/ts/bindings/rust.ts index ad85f82f8c..dce91bf7d0 100644 --- a/ts/bindings/rust.ts +++ b/ts/bindings/rust.ts @@ -23,7 +23,7 @@ import { // eslint-disable-next-line @typescript-eslint/no-floating-promises if (require.main) build() -async function build() { +async function build(): Promise { await buildTypes() await buildSchemas() } @@ -489,7 +489,7 @@ function arrayToType(schema: JsonSchema, context: Context): string { * To reduce memory consumption, only keeps needed properties when * serializing. */ -async function buildSchemas() { +async function buildSchemas(): Promise { const schemas = Object.entries(await jsonSchemas()) .map(([name, schema]) => { let { diff --git a/ts/bindings/typescript.ts b/ts/bindings/typescript.ts index 14e85eb793..ab0d090add 100644 --- a/ts/bindings/typescript.ts +++ b/ts/bindings/typescript.ts @@ -40,13 +40,15 @@ export const generateTypeDefinitions = async (): Promise => { ${autogeneratedHeader('build:ts', path.basename(__filename), '//')} -type Object = Record; - -type Primitives = undefined | null | boolean | number | string | Array | Object; - -${typesInterface(schemas)} - -// Remove properties from an Object if their values is undefined +type Null = null +type Boolean = boolean +type Integer = number +type Number = number +type String = string +type Object = Record +type Primitives = undefined | null | boolean | number | string | Array | Object + +// Remove properties from an Object if their value is undefined const compact = (o: O): O => Object.entries(o).reduce( (compactedO: O, [k, v]) => @@ -54,6 +56,8 @@ const compact = (o: O): O => {} as O ) +${typesInterface(schemas)} + ${filterInterfaceSchemas(schemas).map(interfaceGenerator).join('')} ${filterUnionSchemas(schemas).map(unionGenerator).join('')} @@ -87,15 +91,8 @@ export const typesInterface = (schemas: JsonSchema[]): string => { */ export const titleToType = (title: string): string => { switch (title) { - case 'Null': - case 'Boolean': - case 'Number': - case 'String': - return title.toLowerCase() - case 'Object': - return 'Object' case 'Array': - return 'Array' + return 'Array' default: return title } @@ -226,11 +223,11 @@ const schemaToType = (schema: JsonSchema): string => { if (allOf !== undefined) return allOfToType(allOf) if (schema.enum !== undefined) return enumToType(schema.enum) - if (type === 'null') return 'null' - if (type === 'boolean') return 'boolean' - if (type === 'number') return 'number' - if (type === 'integer') return 'number' - if (type === 'string') return 'string' + if (type === 'null') return 'Null' + if (type === 'boolean') return 'Boolean' + if (type === 'integer') return 'Integer' + if (type === 'number') return 'Number' + if (type === 'string') return 'String' if (type === 'array') return arrayToType(schema) if (type === 'object') return 'Object' @@ -243,7 +240,7 @@ const schemaToType = (schema: JsonSchema): string => { * Assume that any `$ref`s refer to a type defined in the file. */ const $refToType = ($ref: string): string => { - return $ref.replace('.schema.json', '') + return titleToType($ref.replace('.schema.json', '')) } /** @@ -341,11 +338,18 @@ export const generateTypeMaps = async (): Promise => { ${ schema.anyOf ?.reduce((typeMap: string[], type) => { - const typeRef = type.$ref?.replace('.schema.json', '') - const typeName = JSON.stringify(typeRef) - - return typeRef !== undefined - ? [...typeMap, `${typeName}: ${typeName},`] + const name = type.$ref?.replace('.schema.json', '') + return name !== undefined && + ![ + 'Null', + 'Boolean', + 'Integer', + 'Number', + 'String', + 'Array', + 'Object', + ].includes(name) + ? [...typeMap, `${name}: '${name}',`] : typeMap }, []) .join('\n') ?? '' diff --git a/ts/types.ts b/ts/types.ts index 834cdcff5c..7e8f9dcb55 100644 --- a/ts/types.ts +++ b/ts/types.ts @@ -4,24 +4,36 @@ // Do not modify it by hand. Instead, modify the source `.schema.yaml` files // in the `schema` directory and run `npm run build:ts` to regenerate it. -type Object = Record - +type Null = null +type Boolean = boolean +type Integer = number +type Number = number +type String = string +type Object = Record type Primitives = | undefined | null | boolean | number | string - | Array + | Array | Object +// Remove properties from an Object if their value is undefined +const compact = (o: O): O => + Object.entries(o).reduce( + (compactedO: O, [k, v]) => + v === undefined ? compactedO : { ...compactedO, [k]: v }, + {} as O + ) + export interface Types { - Array: Array + Array: Array ArrayValidator: ArrayValidator Article: Article AudioObject: AudioObject BlockContent: BlockContent - Boolean: boolean + Boolean: Boolean BooleanValidator: BooleanValidator Brand: Brand CitationIntentEnumeration: CitationIntentEnumeration @@ -63,6 +75,7 @@ export interface Types { ImageObject: ImageObject Include: Include InlineContent: InlineContent + Integer: Integer IntegerValidator: IntegerValidator Link: Link List: List @@ -79,8 +92,8 @@ export interface Types { Node: Node NontextualAnnotation: NontextualAnnotation Note: Note - Null: null - Number: number + Null: Null + Number: Number NumberValidator: NumberValidator Object: Object Organization: Organization @@ -100,7 +113,7 @@ export interface Types { SoftwareEnvironment: SoftwareEnvironment SoftwareSession: SoftwareSession SoftwareSourceCode: SoftwareSourceCode - String: string + String: String StringValidator: StringValidator Strong: Strong Subscript: Subscript @@ -120,14 +133,6 @@ export interface Types { VolumeMount: VolumeMount } -// Remove properties from an Object if their values is undefined -const compact = (o: O): O => - Object.entries(o).reduce( - (compactedO: O, [k, v]) => - v === undefined ? compactedO : { ...compactedO, [k]: v }, - {} as O - ) - /** * The most simple compound (ie. non-atomic like `number`, `string` etc) type. */ @@ -212,7 +217,7 @@ export interface Entity { | 'Variable' | 'VideoObject' | 'VolumeMount' - id?: string + id?: String meta?: Object } @@ -231,7 +236,7 @@ export const entity = (props: Omit = {}): Entity => ({ */ export interface Cite extends Entity { type: 'Cite' - target: string + target: String citationIntent?: Array citationMode?: | 'Parenthetical' @@ -240,12 +245,12 @@ export interface Cite extends Entity { | 'NarrativeYear' | 'normal' | 'suppressAuthor' - citationPrefix?: string - citationSuffix?: string + citationPrefix?: String + citationSuffix?: String content?: Array - pageEnd?: number | string - pageStart?: number | string - pagination?: string + pageEnd?: Integer | String + pageStart?: Integer | String + pagination?: String } /** @@ -281,9 +286,9 @@ export const citeGroup = (props: Omit): CiteGroup => ({ */ export interface Code extends Entity { type: 'Code' | 'CodeBlock' | 'CodeChunk' | 'CodeExpression' | 'CodeFragment' - text: string - mediaType?: string - programmingLanguage?: string + text: String + mediaType?: String + programmingLanguage?: String } /** @@ -301,8 +306,8 @@ export const code = (props: Omit): Code => ({ */ export interface CodeBlock extends Code { type: 'CodeBlock' | 'CodeChunk' - exportFrom?: string - importTo?: string + exportFrom?: String + importTo?: String } /** @@ -320,17 +325,17 @@ export const codeBlock = (props: Omit): CodeBlock => ({ */ export interface CodeChunk extends CodeBlock { type: 'CodeChunk' - alters?: Array - assigns?: Array - caption?: Array | string - declares?: Array - duration?: number + alters?: Array + assigns?: Array + caption?: Array | String + declares?: Array + duration?: Number errors?: Array - imports?: Array - label?: string + imports?: Array + label?: String outputs?: Array - reads?: Array - uses?: Array + reads?: Array + uses?: Array } /** @@ -388,9 +393,9 @@ export const codeExpression = ( */ export interface CodeError extends Entity { type: 'CodeError' - errorMessage: string - errorType?: string - stackTrace?: string + errorMessage: String + errorType?: String + stackTrace?: String } /** @@ -408,7 +413,7 @@ export const codeError = (props: Omit): CodeError => ({ */ export interface Date extends Entity { type: 'Date' - value: string + value: String } /** @@ -523,12 +528,12 @@ export interface Thing extends Entity { | 'Table' | 'VideoObject' | 'VolumeMount' - alternateNames?: Array - description?: Array | Array | string - identifiers?: Array - images?: Array - name?: string - url?: string + alternateNames?: Array + description?: Array | Array | String + identifiers?: Array + images?: Array + name?: String + url?: String } /** @@ -547,9 +552,9 @@ export const thing = (props: Omit = {}): Thing => ({ */ export interface Brand extends Thing { type: 'Brand' - name: string - logo?: ImageObject | string - reviews?: Array + name: String + logo?: ImageObject | String + reviews?: Array } /** @@ -567,9 +572,9 @@ export const brand = (props: Omit): Brand => ({ */ export interface ContactPoint extends Thing { type: 'ContactPoint' | 'PostalAddress' - availableLanguages?: Array - emails?: Array - telephoneNumbers?: Array + availableLanguages?: Array + emails?: Array + telephoneNumbers?: Array } /** @@ -610,7 +615,7 @@ export interface CreativeWork extends Thing { about?: Array authors?: Array comments?: Array - content?: Array | string + content?: Array | String dateAccepted?: Date dateCreated?: Date dateModified?: Date @@ -619,17 +624,17 @@ export interface CreativeWork extends Thing { editors?: Array fundedBy?: Array funders?: Array - genre?: Array + genre?: Array isPartOf?: CreativeWorkTypes - keywords?: Array - licenses?: Array + keywords?: Array + licenses?: Array maintainers?: Array parts?: Array publisher?: Person | Organization - references?: Array - text?: string - title?: Array | string - version?: string | number + references?: Array + text?: String + title?: Array | String + version?: String | Number } /** @@ -650,9 +655,9 @@ export const creativeWork = ( export interface Article extends CreativeWork { type: 'Article' content?: Array - pageEnd?: number | string - pageStart?: number | string - pagination?: string + pageEnd?: Integer | String + pageStart?: Integer | String + pagination?: String } /** @@ -680,7 +685,7 @@ export interface Claim extends CreativeWork { | 'Hypothesis' | 'Proposition' | 'Corollary' - label?: string + label?: String } /** @@ -716,7 +721,7 @@ export const collection = (props: Omit): Collection => ({ */ export interface Comment extends CreativeWork { type: 'Comment' - commentAspect?: string + commentAspect?: String parentItem?: Comment } @@ -754,11 +759,11 @@ export const datatable = (props: Omit): Datatable => ({ */ export interface MediaObject extends CreativeWork { type: 'MediaObject' | 'AudioObject' | 'ImageObject' | 'VideoObject' - contentUrl: string - bitrate?: number - contentSize?: number - embedUrl?: string - mediaType?: string + contentUrl: String + bitrate?: Number + contentSize?: Number + embedUrl?: String + mediaType?: String } /** @@ -776,8 +781,8 @@ export const mediaObject = (props: Omit): MediaObject => ({ */ export interface AudioObject extends MediaObject { type: 'AudioObject' - caption?: string - transcript?: string + caption?: String + transcript?: String } /** @@ -795,7 +800,7 @@ export const audioObject = (props: Omit): AudioObject => ({ */ export interface DatatableColumn extends Thing { type: 'DatatableColumn' - name: string + name: String values: Array validator?: ArrayValidator } @@ -817,8 +822,8 @@ export const datatableColumn = ( */ export interface DefinedTerm extends Thing { type: 'DefinedTerm' - name: string - termCode?: string + name: String + termCode?: String } /** @@ -864,9 +869,9 @@ export interface ArrayValidator extends Validator { type: 'ArrayValidator' contains?: ValidatorTypes itemsValidator?: ValidatorTypes - maxItems?: number - minItems?: number - uniqueItems?: boolean + maxItems?: Integer + minItems?: Integer + uniqueItems?: Boolean } /** @@ -964,8 +969,8 @@ export const enumeration = ( */ export interface Figure extends CreativeWork { type: 'Figure' - caption?: Array | string - label?: string + caption?: Array | String + label?: String } /** @@ -983,7 +988,7 @@ export const figure = (props: Omit = {}): Figure => ({ */ export interface Function extends Entity { type: 'Function' - name?: string + name?: String parameters?: Array returns?: ValidatorTypes } @@ -1023,7 +1028,7 @@ export const grant = (props: Omit = {}): Grant => ({ export interface Heading extends Entity { type: 'Heading' content: Array - depth?: number + depth?: Integer } /** @@ -1041,7 +1046,7 @@ export const heading = (props: Omit): Heading => ({ */ export interface ImageObject extends MediaObject { type: 'ImageObject' - caption?: string + caption?: String thumbnail?: ImageObject } @@ -1060,9 +1065,9 @@ export const imageObject = (props: Omit): ImageObject => ({ */ export interface Include extends Entity { type: 'Include' - source: string + source: String content?: Array - mediaType?: string + mediaType?: String } /** @@ -1100,11 +1105,11 @@ export const integerValidator = ( export interface Link extends Entity { type: 'Link' content: Array - target: string - exportFrom?: string - importTo?: string - relation?: string - title?: string + target: String + exportFrom?: String + importTo?: String + relation?: String + title?: String } /** @@ -1142,9 +1147,9 @@ export const list = (props: Omit): List => ({ export interface ListItem extends Thing { type: 'ListItem' content?: Array | Array - isChecked?: boolean + isChecked?: Boolean item?: Node - position?: number + position?: Integer } /** @@ -1162,9 +1167,9 @@ export const listItem = (props: Omit = {}): ListItem => ({ */ export interface Math extends Entity { type: 'Math' | 'MathBlock' | 'MathFragment' - text: string - errors?: Array - mathLanguage?: string + text: String + errors?: Array + mathLanguage?: String } /** @@ -1182,7 +1187,7 @@ export const math = (props: Omit): Math => ({ */ export interface MathBlock extends Math { type: 'MathBlock' - label?: string + label?: String } /** @@ -1219,7 +1224,7 @@ export const mathFragment = ( */ export interface MonetaryGrant extends Grant { type: 'MonetaryGrant' - amounts?: number + amounts?: Number funders?: Array } @@ -1278,11 +1283,11 @@ export const note = (props: Omit): Note => ({ */ export interface NumberValidator extends Validator { type: 'NumberValidator' - exclusiveMaximum?: number - exclusiveMinimum?: number - maximum?: number - minimum?: number - multipleOf?: number + exclusiveMaximum?: Number + exclusiveMinimum?: Number + maximum?: Number + minimum?: Number + multipleOf?: Number } /** @@ -1302,13 +1307,13 @@ export const numberValidator = ( */ export interface Organization extends Thing { type: 'Organization' - address?: PostalAddress | string + address?: PostalAddress | String brands?: Array contactPoints?: Array departments?: Array funders?: Array - legalName?: string - logo?: ImageObject | string + legalName?: String + logo?: ImageObject | String members?: Array parentOrganization?: Organization } @@ -1348,8 +1353,8 @@ export const paragraph = (props: Omit): Paragraph => ({ */ export interface Variable extends Entity { type: 'Variable' | 'Parameter' - name: string - isReadonly?: boolean + name: String + isReadonly?: Boolean validator?: ValidatorTypes value?: Node } @@ -1370,9 +1375,9 @@ export const variable = (props: Omit): Variable => ({ export interface Parameter extends Variable { type: 'Parameter' default?: Node - isExtensible?: boolean - isRequired?: boolean - isVariadic?: boolean + isExtensible?: Boolean + isRequired?: Boolean + isVariadic?: Boolean } /** @@ -1392,7 +1397,7 @@ export interface Periodical extends CreativeWork { type: 'Periodical' dateEnd?: Date dateStart?: Date - issns?: Array + issns?: Array } /** @@ -1412,17 +1417,17 @@ export const periodical = ( */ export interface Person extends Thing { type: 'Person' - address?: PostalAddress | string + address?: PostalAddress | String affiliations?: Array - emails?: Array - familyNames?: Array + emails?: Array + familyNames?: Array funders?: Array - givenNames?: Array - honorificPrefix?: string - honorificSuffix?: string - jobTitle?: string + givenNames?: Array + honorificPrefix?: String + honorificSuffix?: String + jobTitle?: String memberOf?: Array - telephoneNumbers?: Array + telephoneNumbers?: Array } /** @@ -1440,12 +1445,12 @@ export const person = (props: Omit = {}): Person => ({ */ export interface PostalAddress extends ContactPoint { type: 'PostalAddress' - addressCountry?: string - addressLocality?: string - addressRegion?: string - postOfficeBoxNumber?: string - postalCode?: string - streetAddress?: string + addressCountry?: String + addressLocality?: String + addressRegion?: String + postOfficeBoxNumber?: String + postalCode?: String + streetAddress?: String } /** @@ -1467,8 +1472,8 @@ export const postalAddress = ( export interface Product extends Thing { type: 'Product' brands?: Array - logo?: ImageObject | string - productID?: string + logo?: ImageObject | String + productID?: String } /** @@ -1486,8 +1491,8 @@ export const product = (props: Omit = {}): Product => ({ */ export interface PropertyValue extends Thing { type: 'PropertyValue' - value: boolean | number | string - propertyID?: string + value: Boolean | Integer | Number | String + propertyID?: String } /** @@ -1508,10 +1513,10 @@ export const propertyValue = ( */ export interface PublicationIssue extends CreativeWork { type: 'PublicationIssue' - issueNumber?: number | string - pageEnd?: number | string - pageStart?: number | string - pagination?: string + issueNumber?: Integer | String + pageEnd?: Integer | String + pageStart?: Integer | String + pagination?: String } /** @@ -1531,10 +1536,10 @@ export const publicationIssue = ( */ export interface PublicationVolume extends CreativeWork { type: 'PublicationVolume' - pageEnd?: number | string - pageStart?: number | string - pagination?: string - volumeNumber?: number | string + pageEnd?: Integer | String + pageStart?: Integer | String + pagination?: String + volumeNumber?: Integer | String } /** @@ -1554,7 +1559,7 @@ export const publicationVolume = ( */ export interface Quote extends Mark { type: 'Quote' - cite?: Cite | string + cite?: Cite | String } /** @@ -1573,7 +1578,7 @@ export const quote = (props: Omit): Quote => ({ export interface QuoteBlock extends Entity { type: 'QuoteBlock' content: Array - cite?: Cite | string + cite?: Cite | String } /** @@ -1592,7 +1597,7 @@ export const quoteBlock = (props: Omit): QuoteBlock => ({ export interface Review extends CreativeWork { type: 'Review' itemReviewed?: Thing - reviewAspect?: string + reviewAspect?: String } /** @@ -1611,7 +1616,7 @@ export const review = (props: Omit = {}): Review => ({ export interface SoftwareApplication extends CreativeWork { type: 'SoftwareApplication' softwareRequirements?: Array - softwareVersion?: string + softwareVersion?: String } /** @@ -1631,7 +1636,7 @@ export const softwareApplication = ( */ export interface SoftwareEnvironment extends Thing { type: 'SoftwareEnvironment' - name: string + name: String adds?: Array extends?: Array removes?: Array @@ -1655,19 +1660,19 @@ export const softwareEnvironment = ( */ export interface SoftwareSession extends Thing { type: 'SoftwareSession' - clientsLimit?: number - clientsRequest?: number - cpuLimit?: number - cpuRequest?: number + clientsLimit?: Number + clientsRequest?: Number + cpuLimit?: Number + cpuRequest?: Number dateEnd?: Date dateStart?: Date - durationLimit?: number - durationRequest?: number + durationLimit?: Number + durationRequest?: Number environment?: SoftwareEnvironment - memoryLimit?: number - memoryRequest?: number - networkTransferLimit?: number - networkTransferRequest?: number + memoryLimit?: Number + memoryRequest?: Number + networkTransferLimit?: Number + networkTransferRequest?: Number status?: | 'Unknown' | 'Starting' @@ -1675,8 +1680,8 @@ export interface SoftwareSession extends Thing { | 'Stopping' | 'Stopped' | 'Failed' - timeoutLimit?: number - timeoutRequest?: number + timeoutLimit?: Number + timeoutRequest?: Number volumeMounts?: Array } @@ -1697,12 +1702,12 @@ export const softwareSession = ( */ export interface SoftwareSourceCode extends CreativeWork { type: 'SoftwareSourceCode' - codeRepository?: string - codeSampleType?: string - programmingLanguage?: string - runtimePlatform?: Array + codeRepository?: String + codeSampleType?: String + programmingLanguage?: String + runtimePlatform?: Array softwareRequirements?: Array< - SoftwareSourceCode | SoftwareApplication | string + SoftwareSourceCode | SoftwareApplication | String > targetProducts?: Array } @@ -1724,9 +1729,9 @@ export const softwareSourceCode = ( */ export interface StringValidator extends Validator { type: 'StringValidator' - maxLength?: number - minLength?: number - pattern?: string + maxLength?: Integer + minLength?: Integer + pattern?: String } /** @@ -1798,8 +1803,8 @@ export const superscript = (props: Omit): Superscript => ({ export interface Table extends CreativeWork { type: 'Table' rows: Array - caption?: Array | string - label?: string + caption?: Array | String + label?: String } /** @@ -1818,10 +1823,10 @@ export const table = (props: Omit): Table => ({ export interface TableCell extends Entity { type: 'TableCell' cellType?: 'Data' | 'Header' - colspan?: number + colspan?: Integer content?: Array | Array - name?: string - rowspan?: number + name?: String + rowspan?: Integer } /** @@ -1897,9 +1902,9 @@ export const tupleValidator = ( */ export interface VideoObject extends MediaObject { type: 'VideoObject' - caption?: string + caption?: String thumbnail?: ImageObject - transcript?: string + transcript?: String } /** @@ -1917,10 +1922,10 @@ export const videoObject = (props: Omit): VideoObject => ({ */ export interface VolumeMount extends Thing { type: 'VolumeMount' - mountDestination: string - mountOptions?: Array - mountSource?: string - mountType?: string + mountDestination: String + mountOptions?: Array + mountSource?: String + mountType?: String } /** @@ -2113,10 +2118,11 @@ export type InlineContent = | Subscript | Superscript | VideoObject - | null - | boolean - | number - | string + | Null + | Boolean + | Integer + | Number + | String /** * All type schemas that are derived from Mark @@ -2228,12 +2234,13 @@ export type Node = | Variable | VideoObject | VolumeMount - | null - | boolean - | number - | string + | Null + | Boolean + | Integer + | Number + | String | Object - | Array + | Array /** * All type schemas that are derived from Thing