Skip to content

Commit

Permalink
FIX: GitHub merge error
Browse files Browse the repository at this point in the history
- restored `Optional` import; and
- made `FileEntry.path` files `Optional` as per original PR.
  • Loading branch information
carlwilson committed Oct 2, 2024
1 parent 814c719 commit f754fd1
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions eark_validator/model/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# under the License.
#
from enum import Enum
from typing import Annotated, List
from typing import Annotated, List, Optional

from pydantic import BaseModel, StringConstraints

Expand All @@ -36,14 +36,14 @@ class EntryType(str, Enum):
METADATA = 'metadata'

class FileEntry(BaseModel):
path : str
path : Optional[str]
type: EntryType = EntryType.FILE
size: Optional[str]
checksum: Checksum
mimetype: Optional[Annotated[ str, StringConstraints(to_lower=True) ]] = MIME_DEFAULT

class InvalidFileEntry(BaseModel):
path: Optional[Path]
path: Optional[str]
type: Optional[EntryType] = EntryType.FILE
size: Optional[str]
checksum: Checksum
Expand Down

0 comments on commit f754fd1

Please sign in to comment.