Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

feat: add Composite Raw Decoder #179

Merged
merged 27 commits into from
Dec 27, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
5b7724d
Composite Decoder: add Composite Decoder
artem1205 Dec 17, 2024
990584e
Composite Decoder: add Models
artem1205 Dec 18, 2024
50782f7
Composite Decoder: ref to use BufferedIOBase
artem1205 Dec 19, 2024
17add9e
Composite Decoder: remove inner_parser from parser definition
artem1205 Dec 19, 2024
655ce35
Composite Decoder: ref models
artem1205 Dec 19, 2024
513aa43
Composite Decoder: clean
artem1205 Dec 19, 2024
eada5bf
Composite Decoder: ref todo
artem1205 Dec 19, 2024
1984ef1
Composite Decoder: remove args & kwargs
artem1205 Dec 19, 2024
8d3f82a
Composite Decoder: fmt mypy
artem1205 Dec 19, 2024
f2c9b0a
Composite Decoder: add to model factory
artem1205 Dec 23, 2024
961356c
Composite Decoder: add to model factory
artem1205 Dec 23, 2024
5fa937c
Composite Raw Decoder: add unittest for parsers
artem1205 Dec 23, 2024
1b85c26
Composite Raw Decoder: fix CompositeRawDecoder creation
artem1205 Dec 23, 2024
a181608
Composite Raw Decoder: ref: CompositeRawDecoder & jsonlinedecoder
artem1205 Dec 23, 2024
5276ed1
Composite Raw Decoder: fmt
artem1205 Dec 23, 2024
adf9d3d
Composite Raw Decoder: fix mypy
artem1205 Dec 23, 2024
7604b99
Composite Raw Decoder: fix mypy
artem1205 Dec 24, 2024
bbd5e3a
Merge remote-tracking branch 'origin/main' into artem1205/add-composi…
artem1205 Dec 24, 2024
f9a97db
CDK: fix conflicts
artem1205 Dec 24, 2024
7fd73ad
CDK: add type for JsonLineParser
artem1205 Dec 26, 2024
693a82d
CDK: rename
artem1205 Dec 26, 2024
ca8f31e
CDK: run prettier
artem1205 Dec 26, 2024
46e80d3
CDK: ref
artem1205 Dec 26, 2024
61a3919
CDK: ref to csv.DictReader
artem1205 Dec 26, 2024
2ff8edf
CDK: fix mypy
artem1205 Dec 26, 2024
9641d4d
CDK: apply coderabbit suggestions
artem1205 Dec 26, 2024
2b6cfb5
CDK: fix
artem1205 Dec 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions airbyte_cdk/sources/declarative/declarative_component_schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2719,9 +2719,44 @@ definitions:
- "$ref": "#/definitions/IterableDecoder"
- "$ref": "#/definitions/XmlDecoder"
- "$ref": "#/definitions/GzipJsonDecoder"
- "$ref": "#/definitions/CompositeRawDecoder"
$parameters:
type: object
additionalProperties: true
CompositeRawDecoder:
description: "(This is experimental, use at your own risk)"
type: object
required:
- parser
properties:
parser:
anyOf:
- "$ref": "#/definitions/GzipParser"
- "$ref": "#/definitions/JsonLineParser"
- "$ref": "#/definitions/CsvParser"
# PARSERS
GzipParser:
type: object
properties:
inner_parser:
anyOf:
- "$ref": "#/definitions/JsonLineParser"
- "$ref": "#/definitions/CsvParser"
JsonLineParser:
type: object
properties:
encoding:
artem1205 marked this conversation as resolved.
Show resolved Hide resolved
type: string
default: utf-8
CsvParser:
type: object
properties:
encoding:
type: string
default: utf-8
delimiter:
type: string
default: ","
AsyncJobStatusMap:
description: Matches the api job status to Async Job Status.
type: object
Expand Down
127 changes: 127 additions & 0 deletions airbyte_cdk/sources/declarative/decoders/composite_decoder.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
import gzip
import json
from abc import ABC, abstractmethod
from dataclasses import dataclass
from typing import Any, Generator, Iterable, MutableMapping, Optional, Protocol

import pandas as pd
import requests
from numpy import nan

from airbyte_cdk.sources.declarative.decoders.decoder import Decoder


class BufferedDataInput(Protocol):
"""
at least read to _n bytes method should be supported to align with BufferedReader and avoid OOM.
"""

def read(self, __n: int) -> bytes: ...


@dataclass
class Parser(ABC):
inner_parser: Optional["Parser"] = None
artem1205 marked this conversation as resolved.
Show resolved Hide resolved

@abstractmethod
def parse(
self, data: BufferedDataInput | Iterable, *args, **kwargs
artem1205 marked this conversation as resolved.
Show resolved Hide resolved
) -> Generator[MutableMapping[str, Any], None, None]:
"""
Parse data and yield dictionaries.
"""
pass


@dataclass
class GzipParser(Parser):
def parse(
self, data: BufferedDataInput | Iterable, *args, **kwargs
) -> Generator[MutableMapping[str, Any], None, None]:
"""
Decompress gzipped bytes and pass decompressed data to the inner parser.
"""
gzipobj = gzip.GzipFile(fileobj=data)
if self.inner_parser:
yield from self.inner_parser.parse(gzipobj)
else:
yield from gzipobj


@dataclass
class JsonLineParser(Parser):
encoding: Optional[str] = "utf-8"

def parse(
self, data: BufferedDataInput | Iterable, *args, **kwargs
) -> Generator[MutableMapping[str, Any], None, None]:
for line in data:
try:
yield json.loads(line.decode(self.encoding))
except json.JSONDecodeError:
# Handle invalid JSON lines gracefully (e.g., log and skip)
pass


@dataclass
class CsvParser(Parser):
# TODO: add more parameters: see read_csv for more details, e.g.: quotechar, headers,
artem1205 marked this conversation as resolved.
Show resolved Hide resolved
encoding: Optional[str] = "utf-8"
delimiter: str = ","

def parse(
self, data: BufferedDataInput | Iterable, *args, **kwargs
) -> Generator[MutableMapping[str, Any], None, None]:
"""
Parse CSV data from decompressed bytes.
"""
reader = pd.read_csv(data, sep=self.delimiter, iterator=True, dtype=object)
for chunk in reader:
chunk = chunk.replace({nan: None}).to_dict(orient="records")
for row in chunk:
yield row


@dataclass
class CompositeRawDecoder(Decoder):
artem1205 marked this conversation as resolved.
Show resolved Hide resolved
"""
Decoder strategy to transform a requests.Response into a Generator[MutableMapping[str, Any], None, None]
passed response.raw to parser(s).
Note: response.raw is not decoded/decompressed by default.
parsers should be instantiated recursively.
Example:
composite_decoder = CompositeDecoder(parser=GzipParser(inner_parser=JsonLineParser(encoding="iso-8859-1")))
"""

parser: Parser

def is_stream_response(self) -> bool:
return True

def decode(
self, response: requests.Response
) -> Generator[MutableMapping[str, Any], None, None]:
yield from self.parser.parse(data=response.raw)


# Examples how to use
if __name__ == "__main__":
# SIMPLE JSONLINES
# composite_decoder = CompositeDecoder(parser=JsonLineParser())
# response = requests.get('http://127.0.0.1:5000/jsonlines', stream=True)
# for rec in composite_decoder.decode(response):
# print(rec)

# Gzipped JSONLINES
# parser = GzipParser(inner_parser=JsonLineParser(encoding="iso-8859-1"))
# composite_decoder = CompositeDecoder(parser=parser)
# response = requests.get('http://127.0.0.1:5000/jsonlines', stream=True)
# for rec in composite_decoder.decode(response):
# print(rec)

# Gzipped TSV
parser = GzipParser(inner_parser=CsvParser(encoding="iso-8859-1", delimiter="\t"))
composite_decoder = CompositeRawDecoder(parser=parser)
response = requests.get("http://127.0.0.1:5000/csv", stream=True)
for rec in composite_decoder.decode(response):
print(rec)
Original file line number Diff line number Diff line change
Expand Up @@ -1109,6 +1109,15 @@ class LegacySessionTokenAuthenticator(BaseModel):
parameters: Optional[Dict[str, Any]] = Field(None, alias="$parameters")


class JsonLineParser(BaseModel):
encoding: Optional[str] = "utf-8"


class CsvParser(BaseModel):
encoding: Optional[str] = "utf-8"
delimiter: Optional[str] = ","


class AsyncJobStatusMap(BaseModel):
type: Optional[Literal["AsyncJobStatusMap"]] = None
running: List[str]
Expand Down Expand Up @@ -1488,6 +1497,10 @@ class RecordSelector(BaseModel):
parameters: Optional[Dict[str, Any]] = Field(None, alias="$parameters")


class GzipParser(BaseModel):
inner_parser: Optional[Union[JsonLineParser, CsvParser]] = None


class Spec(BaseModel):
type: Literal["Spec"]
connection_specification: Dict[str, Any] = Field(
Expand Down Expand Up @@ -1518,6 +1531,10 @@ class CompositeErrorHandler(BaseModel):
parameters: Optional[Dict[str, Any]] = Field(None, alias="$parameters")


class CompositeRawDecoder(BaseModel):
parser: Union[GzipParser, JsonLineParser, CsvParser]


class DeclarativeSource1(BaseModel):
class Config:
extra = Extra.forbid
Expand Down Expand Up @@ -1895,6 +1912,7 @@ class SimpleRetriever(BaseModel):
IterableDecoder,
XmlDecoder,
GzipJsonDecoder,
CompositeRawDecoder,
]
] = Field(
None,
Expand Down
Loading