Skip to content

Commit ebe6b1d

Browse files
roznawskroznawsk
authored
Pypi release (#2)
* Pypi release * Change generated files location * Finally figure out local dependencies * Fix format * Update docker-compose-test.yaml * wip * asd * asdf * asdf * Updates * Fix linter * Remove comment * Don't delete files when generation fails
1 parent 6ca6f3e commit ebe6b1d

47 files changed

Lines changed: 208 additions & 238 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
pkg-manager: pip
2222
- run:
2323
name: Lint
24-
command: pylint --rcfile=pylintrc jellyfish tests
24+
command: ./pylint.sh
2525
- persist_to_workspace:
2626
root: ~/project
2727
paths:

‎README.md‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,18 @@
1-
# python-server-sdk
1+
# Jellyfish Python Server SDK
2+
3+
[![CircleCI](https://dl.circleci.com/status-badge/img/gh/jellyfish-dev/python-server-sdk/tree/main.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/jellyfish-dev/python-server-sdk/tree/main)
4+
5+
Python server SDK for [Jellyfish](https://github.com/jellyfish-dev/jellyfish).
6+
7+
## Installation
8+
TODO
9+
10+
## Usage
11+
12+
## Copyright and License
13+
14+
Copyright 2023, [Software Mansion](https://swmansion.com/?utm_source=git&utm_medium=readme&utm_campaign=jellyfish)
15+
16+
[![Software Mansion](https://logo.swmansion.com/logo?color=white&variant=desktop&width=200&tag=membrane-github)](https://swmansion.com/?utm_source=git&utm_medium=readme&utm_campaign=jellyfish)
17+
18+
Licensed under the [Apache License, Version 2.0](LICENSE)

‎docker-compose-test.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ services:
3030
- network
3131

3232
test:
33-
image: python:3.7-alpine3.18
33+
image: python:3.8-alpine3.18
3434
command: sh -c "cd app/ && pip install -r requirements.txt && pytest"
3535
environment:
3636
- DOCKER_TEST=TRUE
@@ -39,7 +39,8 @@ services:
3939
networks:
4040
- network
4141
depends_on:
42-
- jellyfish
42+
jellyfish:
43+
condition: service_healthy
4344

4445
networks:
4546
network:

‎generate_client.sh‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
#!/bin/bash
22

3-
rm -rf openapi
3+
TMP_DIR="openapi_client_generated"
4+
PACKAGE_NAME="_openapi_client"
5+
46
openapi-generator-cli generate \
57
-i https://raw.githubusercontent.com/jellyfish-dev/jellyfish/main/openapi.yaml \
68
-g python \
7-
-o openapi \
9+
-o $TMP_DIR \
810
-t templates \
9-
--package-name openapi_client \
10-
--global-property apis,models,modelTests=false,supportingFiles
11-
12-
rm -rf openapi/{docs,test,.github,.openapi-generator,.gitignore,.gitlab-ci.yml,.travis.yml,.openapi-generator-ignore,git_push.sh,README.md,setup.cfg,test-requirements.txt,tox.ini}
11+
--package-name jellyfish.$PACKAGE_NAME \
12+
--global-property apis,models,modelTests=false,apiTests=false,modelDocs=false,apiDocs=false,supportingFiles &&
13+
rm -rf jellyfish/$PACKAGE_NAME
14+
mv $TMP_DIR/jellyfish/$PACKAGE_NAME jellyfish/$PACKAGE_NAME
15+
rm -rf $TMP_DIR

‎jellyfish/__init__.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
Python server SDK for [Jellyfish](https://github.com/jellyfish-dev/jellyfish) media server.
33
"""
44

5-
__version__ = "0.1.0"
6-
75
# pylint: disable=locally-disabled, no-name-in-module, import-error
86

97
from pydantic.error_wrappers import ValidationError
108

11-
from openapi_client import Room, RoomConfig, Peer, Component
12-
from openapi_client import ComponentOptions, ComponentOptionsRTSP, PeerOptionsWebRTC
9+
from jellyfish._openapi_client import Room, RoomConfig, Peer, Component
10+
from jellyfish._openapi_client import ComponentOptions, ComponentOptionsRTSP, PeerOptionsWebRTC
1311

14-
from openapi_client.exceptions import UnauthorizedException, NotFoundException, BadRequestException
12+
from jellyfish._openapi_client.exceptions import (
13+
UnauthorizedException, NotFoundException, BadRequestException)
1514

16-
from jellyfish.room_api import RoomApi
15+
from jellyfish._room_api import RoomApi

‎jellyfish/_openapi_client/__init__.py‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# coding: utf-8
2+
3+
# flake8: noqa
4+
5+
"""
6+
Python API wrapper for Jellyfish Media Server
7+
8+
The version of the OpenAPI document: 0.2.0
9+
Generated by OpenAPI Generator (https://openapi-generator.tech)
10+
11+
Do not edit the class manually.
12+
""" # noqa: E501
13+
14+
15+
__version__ = "1.0.0"
16+
17+
# import apis into sdk package
18+
from jellyfish._openapi_client.api.default_api import DefaultApi
19+
from jellyfish._openapi_client.api.room_api import RoomApi
20+
21+
# import ApiClient
22+
from jellyfish._openapi_client.api_response import ApiResponse
23+
from jellyfish._openapi_client.api_client import ApiClient
24+
from jellyfish._openapi_client.configuration import Configuration
25+
from jellyfish._openapi_client.exceptions import OpenApiException
26+
from jellyfish._openapi_client.exceptions import ApiTypeError
27+
from jellyfish._openapi_client.exceptions import ApiValueError
28+
from jellyfish._openapi_client.exceptions import ApiKeyError
29+
from jellyfish._openapi_client.exceptions import ApiAttributeError
30+
from jellyfish._openapi_client.exceptions import ApiException
31+
32+
# import models into sdk package
33+
from jellyfish._openapi_client.models.add_component_request import AddComponentRequest
34+
from jellyfish._openapi_client.models.add_peer_request import AddPeerRequest
35+
from jellyfish._openapi_client.models.component import Component
36+
from jellyfish._openapi_client.models.component_details_response import ComponentDetailsResponse
37+
from jellyfish._openapi_client.models.component_metadata import ComponentMetadata
38+
from jellyfish._openapi_client.models.component_options import ComponentOptions
39+
from jellyfish._openapi_client.models.component_options_rtsp import ComponentOptionsRTSP
40+
from jellyfish._openapi_client.models.error import Error
41+
from jellyfish._openapi_client.models.hls_skip import HlsSkip
42+
from jellyfish._openapi_client.models.peer import Peer
43+
from jellyfish._openapi_client.models.peer_details_response import PeerDetailsResponse
44+
from jellyfish._openapi_client.models.peer_details_response_data import PeerDetailsResponseData
45+
from jellyfish._openapi_client.models.peer_options import PeerOptions
46+
from jellyfish._openapi_client.models.peer_options_web_rtc import PeerOptionsWebRTC
47+
from jellyfish._openapi_client.models.peer_status import PeerStatus
48+
from jellyfish._openapi_client.models.room import Room
49+
from jellyfish._openapi_client.models.room_config import RoomConfig
50+
from jellyfish._openapi_client.models.room_create_details_response import RoomCreateDetailsResponse
51+
from jellyfish._openapi_client.models.room_create_details_response_data import RoomCreateDetailsResponseData
52+
from jellyfish._openapi_client.models.room_details_response import RoomDetailsResponse
53+
from jellyfish._openapi_client.models.rooms_listing_response import RoomsListingResponse

‎jellyfish/_openapi_client/api/__init__.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# flake8: noqa
2+
3+
# import apis into api package
4+
from jellyfish._openapi_client.api.default_api import DefaultApi
5+
from jellyfish._openapi_client.api.room_api import RoomApi
6+

openapi/openapi_client/api/default_api.py renamed to jellyfish/_openapi_client/api/default_api.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121

2222
from typing import Optional
2323

24-
from openapi_client.models.hls_skip import HlsSkip
24+
from jellyfish._openapi_client.models.hls_skip import HlsSkip
2525

26-
from openapi_client.api_client import ApiClient
27-
from openapi_client.api_response import ApiResponse
28-
from openapi_client.exceptions import ( # noqa: F401
26+
from jellyfish._openapi_client.api_client import ApiClient
27+
from jellyfish._openapi_client.api_response import ApiResponse
28+
from jellyfish._openapi_client.exceptions import ( # noqa: F401
2929
ApiTypeError,
3030
ApiValueError
3131
)

openapi/openapi_client/api/room_api.py renamed to jellyfish/_openapi_client/api/room_api.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@
2121

2222
from typing import Optional
2323

24-
from openapi_client.models.add_component_request import AddComponentRequest
25-
from openapi_client.models.add_peer_request import AddPeerRequest
26-
from openapi_client.models.component_details_response import ComponentDetailsResponse
27-
from openapi_client.models.peer_details_response import PeerDetailsResponse
28-
from openapi_client.models.room_config import RoomConfig
29-
from openapi_client.models.room_create_details_response import RoomCreateDetailsResponse
30-
from openapi_client.models.room_details_response import RoomDetailsResponse
31-
from openapi_client.models.rooms_listing_response import RoomsListingResponse
32-
33-
from openapi_client.api_client import ApiClient
34-
from openapi_client.api_response import ApiResponse
35-
from openapi_client.exceptions import ( # noqa: F401
24+
from jellyfish._openapi_client.models.add_component_request import AddComponentRequest
25+
from jellyfish._openapi_client.models.add_peer_request import AddPeerRequest
26+
from jellyfish._openapi_client.models.component_details_response import ComponentDetailsResponse
27+
from jellyfish._openapi_client.models.peer_details_response import PeerDetailsResponse
28+
from jellyfish._openapi_client.models.room_config import RoomConfig
29+
from jellyfish._openapi_client.models.room_create_details_response import RoomCreateDetailsResponse
30+
from jellyfish._openapi_client.models.room_details_response import RoomDetailsResponse
31+
from jellyfish._openapi_client.models.rooms_listing_response import RoomsListingResponse
32+
33+
from jellyfish._openapi_client.api_client import ApiClient
34+
from jellyfish._openapi_client.api_response import ApiResponse
35+
from jellyfish._openapi_client.exceptions import ( # noqa: F401
3636
ApiTypeError,
3737
ApiValueError
3838
)

openapi/openapi_client/api_client.py renamed to jellyfish/_openapi_client/api_client.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222

2323
from urllib.parse import quote
2424

25-
from openapi_client.configuration import Configuration
26-
from openapi_client.api_response import ApiResponse
27-
import openapi_client.models
28-
from openapi_client import rest
29-
from openapi_client.exceptions import ApiValueError, ApiException
25+
from jellyfish._openapi_client.configuration import Configuration
26+
from jellyfish._openapi_client.api_response import ApiResponse
27+
import jellyfish._openapi_client.models
28+
from jellyfish._openapi_client import rest
29+
from jellyfish._openapi_client.exceptions import ApiValueError, ApiException
3030

3131

3232
class ApiClient(object):
@@ -339,7 +339,7 @@ def __deserialize(self, data, klass):
339339
if klass in self.NATIVE_TYPES_MAPPING:
340340
klass = self.NATIVE_TYPES_MAPPING[klass]
341341
else:
342-
klass = getattr(openapi_client.models, klass)
342+
klass = getattr(jellyfish._openapi_client.models, klass)
343343

344344
if klass in self.PRIMITIVE_TYPES:
345345
return self.__deserialize_primitive(data, klass)

0 commit comments

Comments
 (0)