Adding language support to Birdy #164

f-PLT · 2020-02-14T16:01:18Z

Do not merge before a OWSLib version containing language support has been released. (Currently only on master branch)

Has been tested using local copy of OWSLib library taken from it's master branch.

Before merging

Added language support to Birdy
Review, improvements/comments
Release of new OWSLib version that includes language support
Update required OWSLib version in requirements.txt, environment.yml and where also necessary

Overview

This PR applies changes to integrate language support being integrated in PyWPS and OWSLib geopython/OWSLib#654

Changes:

Language parameter to WPSClient and BirdyCLI classes
Basic getter and setter functions for WPSClient language property.
Two simple tests

Added language parameter to WPSClient and BirdyCLI classes to bring in line with changes to OWSLib. Only works with updated OWSLib module.

Was only used while playing with tests and learning about the code base. Forgot to remove.

birdy/client/base.py

Co-Authored-By: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>

birdy/client/base.py

davidcaron · 2020-02-14T16:17:54Z

birdy/client/base.py

        """
        self._converters = converters
        self._interactive = progress
        self._mode = ASYNC if progress else SYNC
        self._notebook = notebook.is_notebook()
        self._inputs = {}
        self._outputs = {}
+        self._language = language


This is not necessary (the language property takes its value in self._wps.language)

Oh, right. Didn't remove this one after adding the language property functions.

davidcaron · 2020-02-14T16:44:27Z

birdy/cli/base.py

    """
-    def __init__(self, name=None, url=None, caps_xml=None, desc_xml=None, **attrs):
+    def __init__(self, name=None, url=None, caps_xml=None, desc_xml=None, language=None, **attrs):


I'm not sure this is doing what you want for the cli... I think you want to add the language option in _update_commands.

hmm.. I added it mainly so it could be passed on for self.wps = WebProcessingService(...), so an instance of the BirdyCLI class could be initiated with a language, but it might be a lack of comprehension of how click.MultiCommand works and is used.

Should I remove the language parameter from the init and WebProcessingService instantiation and only add it as a command?

I'm not familiar enough with click either... I would need to check into this more.

If you want, you can focus this PR on adding language support for the client only, or find how to add it as a parameter to the cli also.

Alright, well I don't think adding it to the cli is bad per say, as it still is a class that has a wps as a parameter, which can receive a language parameter. It might not be a best practice for click though...

I have time to dig a bit more into click. If it turns out to be a time sink or I get submerged by other assignments, I'll revert what I changed to BirdyCli and we'll save it for a future PR.

…to add-multiple-lang-support

huard · 2020-03-12T13:10:57Z

Status ?

davidcaron · 2020-03-12T14:10:51Z

@f-PLT I should have some time today to look at this.

f-PLT · 2020-03-12T14:16:42Z

I tested my modifications of the WPSClient class with a local copy of OWSLib that includes the language parameter changes, so that aspect should be ok.

For BirdyCli, I have a working prototype of the language command, but requires more testing, which I have not had time to do, having been assigned other tasks in the meantime. It's also the first time I try my hands at a Click.MultiCommand implementation, so I expect improvements/corrections can be made.

In all cases, will require a release of OWSLib that includes the language parameter, and should be pretty quick once it's out.

huard · 2020-03-12T14:55:55Z

@cehbrecht Possible to have a minor owslib release for the language support ?

cehbrecht · 2020-03-12T15:04:31Z

@huard I will prepare a 0.19.2 owslib release ...

davidcaron · 2020-03-12T19:36:54Z

@f-PLT take a look at 993aff5 You can test with https://finch.crim.ca/wps

f-PLT · 2020-03-12T20:01:11Z

Perfect, will get on it tomorrow morning.

davidcaron · 2020-03-23T17:05:26Z

@f-PLT tests should pass with the changes in this branch: https://github.com/bird-house/birdy/tree/pr-164-fix-tests

test_help() and test_show_languages() require an online wps (Emu, in this case)

f-PLT · 2020-03-30T21:08:17Z

Integrated David's changes. CLI tests however now require to be online tests (with Emu). I also tested Birdy manually and everything seems to work.

I do, however, get the three following test failures for the full test suites.

tests/test_client.py::test_wps_wordcounter FAILED
tests/test_client.py::test_asobj FAILED
tests/test_client.py::test_inputs FAILED

I'm using a docker deployment of Emu, as per the documentation. I also get those failures if running the tests from the master branch of Birdy.

I don't know if it's something on my part or if it's an expected/known behavior, being new to Birdy's development.

Zeitsperre · 2020-03-30T21:41:32Z

@f-PLT I'm tagging @cehbrecht as he's much more capable of tackling these errors than I.

cehbrecht · 2020-03-31T11:26:02Z

@f-PLT code looks good to me. I was checking with a local instance of emu and tests all passed. Thanks for the good work :)

huard · 2020-04-20T18:54:05Z

I've added an explicit test using the Emu branch with the new translation process and everything is working fine.

@f-PLT @cehbrecht At the moment, language and languages are part of the WPSClient instance scope, along with processes. So in theory, a process identifier with one of these two names would create a namespace clash.

Options:

We could store language and languages into a _settings attribute.
We could prefix language and languages with an underscore.
We could check if a process shadows an existing attribute and raise a warning.

Thoughts ?

huard · 2020-04-20T19:55:58Z

I suggest we merge this PR as is, and then open a new ticket to review settings access and modifications in general.

cehbrecht · 2020-04-21T14:44:05Z

Options:

* We could store language and languages into a `_settings` attribute.

* We could prefix language and languages with an underscore.

* We could check if a process shadows an existing attribute and raise a warning.

Thoughts ?

I would vote for the first two options.

cehbrecht · 2020-04-21T14:44:30Z

I suggest we merge this PR as is, and then open a new ticket to review settings access and modifications in general.

I agree.

francisPLT added 2 commits February 14, 2020 10:01

Added language parameter

4e56a27

Added language parameter to WPSClient and BirdyCLI classes to bring in line with changes to OWSLib. Only works with updated OWSLib module.

Removed small change used to test behavior

8f4aea2

Was only used while playing with tests and learning about the code base. Forgot to remove.

f-PLT requested a review from davidcaron February 14, 2020 16:01

Zeitsperre reviewed Feb 14, 2020

View reviewed changes

birdy/client/base.py Outdated Show resolved Hide resolved

client/base.py : Fixed typo in language code

753e2fa

Co-Authored-By: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>

davidcaron requested changes Feb 14, 2020

View reviewed changes

francisPLT added 5 commits February 17, 2020 16:18

Removed unecessary parameter

81bc511

BirdyCLI language command prototype

42656a7

str.format for string construction

36fb394

Merge branch 'add-multiple-lang-support' of github.com:f-PLT/birdy in…

8bf515d

…to add-multiple-lang-support

Precision for language cmd description

70c8a3d

cehbrecht mentioned this pull request Mar 12, 2020

update changes 0.19.2 geopython/OWSLib#668

Merged

fix language parameters in cli

993aff5

David Caron and others added 8 commits March 12, 2020 17:02

require owslib>=0.19.2 for language support feature

eb81a32

test_cli adjustments

455d158

test_cli test name change + type

dac80f6

more descriptive error message

6be9776

flake8

b440960

test using the real cli entrypoint

93775de

fix ctx.obj handling

087c420

fix listing of process arguments containing spaces

8f52aac

Make tests online only

16c8c25

test_help() and test_show_languages() require an online wps (Emu, in this case)

f-PLT requested a review from Zeitsperre March 30, 2020 21:09

Zeitsperre requested a review from cehbrecht March 30, 2020 21:41

cehbrecht approved these changes Mar 31, 2020

View reviewed changes

f-PLT requested a review from davidcaron March 31, 2020 16:09

f-PLT changed the title ~~WIP : Adding language support to Birdy~~ Adding language support to Birdy Apr 14, 2020

huard mentioned this pull request Apr 14, 2020

Added Translation process. Configured language not recognized bird-house/emu#102

Merged

use fixtures in offline tests. Check translation

2f0b071

huard merged commit b660066 into bird-house:master Apr 21, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding language support to Birdy #164

Adding language support to Birdy #164

f-PLT commented Feb 14, 2020 •

edited

Loading

davidcaron Feb 14, 2020

f-PLT Feb 17, 2020

davidcaron Feb 14, 2020

f-PLT Feb 17, 2020

davidcaron Feb 17, 2020

f-PLT Feb 17, 2020

huard commented Mar 12, 2020

davidcaron commented Mar 12, 2020

f-PLT commented Mar 12, 2020

huard commented Mar 12, 2020

cehbrecht commented Mar 12, 2020

davidcaron commented Mar 12, 2020 •

edited

Loading

f-PLT commented Mar 12, 2020

davidcaron commented Mar 23, 2020

f-PLT commented Mar 30, 2020

Zeitsperre commented Mar 30, 2020

cehbrecht commented Mar 31, 2020

huard commented Apr 20, 2020

huard commented Apr 20, 2020

cehbrecht commented Apr 21, 2020

cehbrecht commented Apr 21, 2020

Adding language support to Birdy #164

Adding language support to Birdy #164

Conversation

f-PLT commented Feb 14, 2020 • edited Loading

Before merging

Overview

davidcaron Feb 14, 2020

Choose a reason for hiding this comment

f-PLT Feb 17, 2020

Choose a reason for hiding this comment

davidcaron Feb 14, 2020

Choose a reason for hiding this comment

f-PLT Feb 17, 2020

Choose a reason for hiding this comment

davidcaron Feb 17, 2020

Choose a reason for hiding this comment

f-PLT Feb 17, 2020

Choose a reason for hiding this comment

huard commented Mar 12, 2020

davidcaron commented Mar 12, 2020

f-PLT commented Mar 12, 2020

huard commented Mar 12, 2020

cehbrecht commented Mar 12, 2020

davidcaron commented Mar 12, 2020 • edited Loading

f-PLT commented Mar 12, 2020

davidcaron commented Mar 23, 2020

f-PLT commented Mar 30, 2020

Zeitsperre commented Mar 30, 2020

cehbrecht commented Mar 31, 2020

huard commented Apr 20, 2020

huard commented Apr 20, 2020

cehbrecht commented Apr 21, 2020

cehbrecht commented Apr 21, 2020

f-PLT commented Feb 14, 2020 •

edited

Loading

davidcaron commented Mar 12, 2020 •

edited

Loading